OSDN Git Service

Merge commit 'abfdaea' into merge
authorEtan Cohen <etancohen@google.com>
Sat, 6 Jun 2015 00:07:48 +0000 (17:07 -0700)
committerEtan Cohen <etancohen@google.com>
Sat, 6 Jun 2015 00:07:48 +0000 (17:07 -0700)
Change-Id: I5b3c0a48c9d47bcb02d49132077f9e258481de2d

1  2 
api/system-current.txt
telephony/java/android/telephony/CarrierConfigManager.java

@@@ -32866,72 -30815,24 +32866,74 @@@ package android.telecom 
  package android.telephony {
  
    public class CarrierConfigManager {
 -    ctor public CarrierConfigManager();
 -    method public android.os.Bundle getConfig();
 -    method public android.os.Bundle getConfigForSubId(int);
 -    method public static android.os.Bundle getDefaultConfig();
 +    method public android.os.PersistableBundle getConfig();
 +    method public android.os.PersistableBundle getConfigForSubId(int);
 +    method public static android.os.PersistableBundle getDefaultConfig();
      method public void reloadCarrierConfigForSubId(int);
      method public void updateConfigForPhoneId(int, java.lang.String);
 -    field public static final java.lang.String ACTION_CARRIER_CONFIG_CHANGED = "android.intent.action.carrier_config_changed";
 -    field public static final java.lang.String BOOL_ALLOW_EMERGENCY_VIDEO_CALLS = "bool_allow_emergency_video_calls";
 +    field public static final java.lang.String ACTION_CARRIER_CONFIG_CHANGED = "android.telephony.action.CARRIER_CONFIG_CHANGED";
++    final java.lang.String BOOL_ALLOW_EMERGENCY_VIDEO_CALLS = "bool_allow_emergency_video_calls";
+     field public static final java.lang.String BOOL_ALLOW_VIDEO_PAUSE = "bool_allow_video_pause";
 -    field public static final java.lang.String BOOL_CARRIER_VOLTE_AVAILABLE = "bool_carrier_volte_available";
 -    field public static final java.lang.String BOOL_CARRIER_VOLTE_PROVISIONED = "bool_carrier_volte_provisioned";
 -    field public static final java.lang.String BOOL_CARRIER_VOLTE_TTY_SUPPORTED = "bool_carrier_volte_tty_supported";
 -    field public static final java.lang.String BOOL_SHOW_APN_SETTING_CDMA = "bool_show_apn_setting_cdma";
 -    field public static final java.lang.String INT_VOLTE_REPLACEMENT_RAT = "int_volte_replacement_rat";
 -    field public static final java.lang.String SHORT_VVM_PORT_NUMBER = "string_vvm_port_number";
 -    field public static final java.lang.String STRING_VVM_DESTINATION_NUMBER = "string_vvm_destination_number";
 -    field public static final java.lang.String STRING_VVM_TYPE = "string_vvm_type";
 -    field public static final java.lang.String VVM_TYPE_OMTP = "vvm_type_omtp";
 +    field public static final java.lang.String KEY_ADDITIONAL_CALL_SETTING_BOOL = "additional_call_setting_bool";
 +    field public static final java.lang.String KEY_ALLOW_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL = "allow_emergency_numbers_in_call_log_bool";
 +    field public static final java.lang.String KEY_ALLOW_LOCAL_DTMF_TONES_BOOL = "allow_local_dtmf_tones_bool";
 +    field public static final java.lang.String KEY_APN_EXPAND_BOOL = "apn_expand_bool";
 +    field public static final java.lang.String KEY_AUTO_RETRY_ENABLED_BOOL = "auto_retry_enabled_bool";
 +    field public static final java.lang.String KEY_CARRIER_SETTINGS_ENABLE_BOOL = "carrier_settings_enable_bool";
 +    field public static final java.lang.String KEY_CARRIER_VOLTE_AVAILABLE_BOOL = "carrier_volte_available_bool";
 +    field public static final java.lang.String KEY_CARRIER_VOLTE_PROVISIONED_BOOL = "carrier_volte_provisioned_bool";
 +    field public static final java.lang.String KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL = "carrier_volte_tty_supported_bool";
 +    field public static final java.lang.String KEY_DISABLE_CDMA_ACTIVATION_CODE_BOOL = "disable_cdma_activation_code_bool";
 +    field public static final java.lang.String KEY_DTMF_TYPE_ENABLED_BOOL = "dtmf_type_enabled_bool";
 +    field public static final java.lang.String KEY_ENABLE_DIALER_KEY_VIBRATION_BOOL = "key_enable_dialer_vibration_bool";
 +    field public static final java.lang.String KEY_HAS_IN_CALL_NOISE_SUPPRESSION_BOOL = "has_in_call_noise_suppression_bool";
 +    field public static final java.lang.String KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL = "hide_carrier_network_settings_bool";
 +    field public static final java.lang.String KEY_IGNORE_SIM_NETWORK_LOCKED_EVENTS_BOOL = "ignore_sim_network_locked_events_bool";
 +    field public static final java.lang.String KEY_MMS_ALIAS_ENABLED_BOOL = "aliasEnabled";
 +    field public static final java.lang.String KEY_MMS_ALIAS_MAX_CHARS_INT = "aliasMaxChars";
 +    field public static final java.lang.String KEY_MMS_ALIAS_MIN_CHARS_INT = "aliasMinChars";
 +    field public static final java.lang.String KEY_MMS_ALLOW_ATTACH_AUDIO_BOOL = "allowAttachAudio";
 +    field public static final java.lang.String KEY_MMS_APPEND_TRANSACTION_ID_BOOL = "enabledTransID";
 +    field public static final java.lang.String KEY_MMS_EMAIL_GATEWAY_NUMBER_STRING = "emailGatewayNumber";
 +    field public static final java.lang.String KEY_MMS_GROUP_MMS_ENABLED_BOOL = "enableGroupMms";
 +    field public static final java.lang.String KEY_MMS_HTTP_PARAMS_STRING = "httpParams";
 +    field public static final java.lang.String KEY_MMS_HTTP_SOCKET_TIMEOUT_INT = "httpSocketTimeout";
 +    field public static final java.lang.String KEY_MMS_MAX_IMAGE_HEIGHT_INT = "maxImageHeight";
 +    field public static final java.lang.String KEY_MMS_MAX_IMAGE_WIDTH_INT = "maxImageWidth";
 +    field public static final java.lang.String KEY_MMS_MAX_MESSAGE_SIZE_INT = "maxMessageSize";
 +    field public static final java.lang.String KEY_MMS_MESSAGE_TEXT_MAX_SIZE_INT = "maxMessageTextSize";
 +    field public static final java.lang.String KEY_MMS_MMS_DELIVERY_REPORT_ENABLED_BOOL = "enableMMSDeliveryReports";
 +    field public static final java.lang.String KEY_MMS_MMS_ENABLED_BOOL = "enabledMMS";
 +    field public static final java.lang.String KEY_MMS_MMS_READ_REPORT_ENABLED_BOOL = "enableMMSReadReports";
 +    field public static final java.lang.String KEY_MMS_MULTIPART_SMS_ENABLED_BOOL = "enableMultipartSMS";
 +    field public static final java.lang.String KEY_MMS_NAI_SUFFIX_STRING = "naiSuffix";
 +    field public static final java.lang.String KEY_MMS_NOTIFY_WAP_MMSC_ENABLED_BOOL = "enabledNotifyWapMMSC";
 +    field public static final java.lang.String KEY_MMS_RECIPIENT_LIMIT_INT = "recipientLimit";
 +    field public static final java.lang.String KEY_MMS_SEND_MULTIPART_SMS_AS_SEPARATE_MESSAGES_BOOL = "sendMultipartSmsAsSeparateMessages";
 +    field public static final java.lang.String KEY_MMS_SHOW_CELL_BROADCAST_APP_LINKS_BOOL = "config_cellBroadcastAppLinks";
 +    field public static final java.lang.String KEY_MMS_SMS_DELIVERY_REPORT_ENABLED_BOOL = "enableSMSDeliveryReports";
 +    field public static final java.lang.String KEY_MMS_SMS_TO_MMS_TEXT_LENGTH_THRESHOLD_INT = "smsToMmsTextLengthThreshold";
 +    field public static final java.lang.String KEY_MMS_SMS_TO_MMS_TEXT_THRESHOLD_INT = "smsToMmsTextThreshold";
 +    field public static final java.lang.String KEY_MMS_SUBJECT_MAX_LENGTH_INT = "maxSubjectLength";
 +    field public static final java.lang.String KEY_MMS_SUPPORT_HTTP_CHARSET_HEADER_BOOL = "supportHttpCharsetHeader";
 +    field public static final java.lang.String KEY_MMS_SUPPORT_MMS_CONTENT_DISPOSITION_BOOL = "supportMmsContentDisposition";
 +    field public static final java.lang.String KEY_MMS_UA_PROF_TAG_NAME_STRING = "uaProfTagName";
 +    field public static final java.lang.String KEY_MMS_UA_PROF_URL_STRING = "uaProfUrl";
 +    field public static final java.lang.String KEY_MMS_USER_AGENT_STRING = "userAgent";
 +    field public static final java.lang.String KEY_OPERATOR_SELECTION_EXPAND_BOOL = "operator_selection_expand_bool";
 +    field public static final java.lang.String KEY_PREFER_2G_BOOL = "prefer_2g_bool";
 +    field public static final java.lang.String KEY_SHOW_APN_SETTING_CDMA_BOOL = "show_apn_setting_cdma_bool";
 +    field public static final java.lang.String KEY_SHOW_CDMA_CHOICES_BOOL = "show_cdma_choices_bool";
 +    field public static final java.lang.String KEY_SHOW_ONSCREEN_DIAL_BUTTON_BOOL = "show_onscreen_dial_button_bool";
 +    field public static final java.lang.String KEY_SIM_NETWORK_UNLOCK_ALLOW_DISMISS_BOOL = "sim_network_unlock_allow_dismiss_bool";
 +    field public static final java.lang.String KEY_SUPPORT_PAUSE_IMS_VIDEO_CALLS_BOOL = "support_pause_ims_video_calls_bool";
 +    field public static final java.lang.String KEY_SUPPORT_SWAP_AFTER_MERGE_BOOL = "support_swap_after_merge_bool";
 +    field public static final java.lang.String KEY_USE_HFA_FOR_PROVISIONING_BOOL = "use_hfa_for_provisioning_bool";
 +    field public static final java.lang.String KEY_USE_OTASP_FOR_PROVISIONING_BOOL = "use_otasp_for_provisioning_bool";
 +    field public static final java.lang.String KEY_VOICEMAIL_NOTIFICATION_PERSISTENT_BOOL = "voicemail_notification_persistent_bool";
 +    field public static final java.lang.String KEY_VOICE_PRIVACY_DISABLE_BOOL = "voice_privacy_disable_bool";
 +    field public static final java.lang.String KEY_VOLTE_REPLACEMENT_RAT_INT = "volte_replacement_rat_int";
 +    field public static final java.lang.String KEY_WORLD_PHONE_BOOL = "world_phone_bool";
    }
  
    public final class CellIdentityCdma implements android.os.Parcelable {
@@@ -235,113 -106,48 +235,139 @@@ public class CarrierConfigManager 
       *
       * @hide
       */
 -    @SystemApi
 -    public static final String VVM_TYPE_OMTP = "vvm_type_omtp";
 +    public static final String KEY_CARRIER_VVM_PACKAGE_NAME_STRING = "carrier_vvm_package_name_string";
 +
 +    // These variables are used by the MMS service and exposed through another API, {@link
 +    // SmsManager}. The variable names and string values are copied from there.
 +    public static final String KEY_MMS_ALIAS_ENABLED_BOOL = "aliasEnabled";
 +    public static final String KEY_MMS_ALLOW_ATTACH_AUDIO_BOOL = "allowAttachAudio";
 +    public static final String KEY_MMS_APPEND_TRANSACTION_ID_BOOL = "enabledTransID";
 +    public static final String KEY_MMS_GROUP_MMS_ENABLED_BOOL = "enableGroupMms";
 +    public static final String KEY_MMS_MMS_DELIVERY_REPORT_ENABLED_BOOL = "enableMMSDeliveryReports";
 +    public static final String KEY_MMS_MMS_ENABLED_BOOL = "enabledMMS";
 +    public static final String KEY_MMS_MMS_READ_REPORT_ENABLED_BOOL = "enableMMSReadReports";
 +    public static final String KEY_MMS_MULTIPART_SMS_ENABLED_BOOL = "enableMultipartSMS";
 +    public static final String KEY_MMS_NOTIFY_WAP_MMSC_ENABLED_BOOL = "enabledNotifyWapMMSC";
 +    public static final String KEY_MMS_SEND_MULTIPART_SMS_AS_SEPARATE_MESSAGES_BOOL = "sendMultipartSmsAsSeparateMessages";
 +    public static final String KEY_MMS_SHOW_CELL_BROADCAST_APP_LINKS_BOOL = "config_cellBroadcastAppLinks";
 +    public static final String KEY_MMS_SMS_DELIVERY_REPORT_ENABLED_BOOL = "enableSMSDeliveryReports";
 +    public static final String KEY_MMS_SUPPORT_HTTP_CHARSET_HEADER_BOOL = "supportHttpCharsetHeader";
 +    public static final String KEY_MMS_SUPPORT_MMS_CONTENT_DISPOSITION_BOOL = "supportMmsContentDisposition";
 +    public static final String KEY_MMS_ALIAS_MAX_CHARS_INT = "aliasMaxChars";
 +    public static final String KEY_MMS_ALIAS_MIN_CHARS_INT = "aliasMinChars";
 +    public static final String KEY_MMS_HTTP_SOCKET_TIMEOUT_INT = "httpSocketTimeout";
 +    public static final String KEY_MMS_MAX_IMAGE_HEIGHT_INT = "maxImageHeight";
 +    public static final String KEY_MMS_MAX_IMAGE_WIDTH_INT = "maxImageWidth";
 +    public static final String KEY_MMS_MAX_MESSAGE_SIZE_INT = "maxMessageSize";
 +    public static final String KEY_MMS_MESSAGE_TEXT_MAX_SIZE_INT = "maxMessageTextSize";
 +    public static final String KEY_MMS_RECIPIENT_LIMIT_INT = "recipientLimit";
 +    public static final String KEY_MMS_SMS_TO_MMS_TEXT_LENGTH_THRESHOLD_INT = "smsToMmsTextLengthThreshold";
 +    public static final String KEY_MMS_SMS_TO_MMS_TEXT_THRESHOLD_INT = "smsToMmsTextThreshold";
 +    public static final String KEY_MMS_SUBJECT_MAX_LENGTH_INT = "maxSubjectLength";
 +    public static final String KEY_MMS_EMAIL_GATEWAY_NUMBER_STRING = "emailGatewayNumber";
 +    public static final String KEY_MMS_HTTP_PARAMS_STRING = "httpParams";
 +    public static final String KEY_MMS_NAI_SUFFIX_STRING = "naiSuffix";
 +    public static final String KEY_MMS_UA_PROF_TAG_NAME_STRING = "uaProfTagName";
 +    public static final String KEY_MMS_UA_PROF_URL_STRING = "uaProfUrl";
 +    public static final String KEY_MMS_USER_AGENT_STRING = "userAgent";
  
 -    private final static String TAG = "CarrierConfigManager";
 -
+     /**
+      * Flag indicating whether to allow carrier video calls to emergency numbers.
+      * When {@code true}, video calls to emergency numbers will be allowed.  When {@code false},
+      * video calls to emergency numbers will be initiated as audio-only calls instead.
+      *
+      * @hide
+      */
+     @SystemApi
+     public static final String BOOL_ALLOW_EMERGENCY_VIDEO_CALLS =
+             "bool_allow_emergency_video_calls";
+     /**
+      * Flag indicating whether the carrier supports video pause signaling.  When {@code true}, the
+      * carrier supports use of the {@link android.telecom.VideoProfile#STATE_PAUSED} video state
+      * to pause transmission of video when the In-Call app is sent to the background.
+      * When {@code false}, video pause signaling is not supported.  {@code True} by default unless
+      * a carrier configuration overrides the default.
+      *
+      * @hide
+      */
+     @SystemApi
+     public static final String BOOL_ALLOW_VIDEO_PAUSE =
+             "bool_allow_video_pause";
      /** The default value for every variable. */
 -    private final static Bundle sDefaults;
 +    private final static PersistableBundle sDefaults;
  
      static {
 -        sDefaults = new Bundle();
 -        sDefaults.putBoolean(BOOL_CARRIER_VOLTE_AVAILABLE, false);
 -        sDefaults.putBoolean(BOOL_CARRIER_VOLTE_PROVISIONED, false);
 -        sDefaults.putBoolean(BOOL_CARRIER_VOLTE_TTY_SUPPORTED, true);
 -        sDefaults.putBoolean(BOOL_SHOW_APN_SETTING_CDMA, false);
 +        sDefaults = new PersistableBundle();
 +        sDefaults.putBoolean(KEY_ADDITIONAL_CALL_SETTING_BOOL, true);
 +        sDefaults.putBoolean(KEY_ALLOW_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL, false);
 +        sDefaults.putBoolean(KEY_ALLOW_LOCAL_DTMF_TONES_BOOL, true);
 +        sDefaults.putBoolean(KEY_APN_EXPAND_BOOL, true);
 +        sDefaults.putBoolean(KEY_AUTO_RETRY_ENABLED_BOOL, false);
 +        sDefaults.putBoolean(KEY_CARRIER_SETTINGS_ENABLE_BOOL, false);
 +        sDefaults.putBoolean(KEY_CARRIER_VOLTE_AVAILABLE_BOOL, false);
 +        sDefaults.putBoolean(KEY_CARRIER_VOLTE_PROVISIONED_BOOL, false);
 +        sDefaults.putBoolean(KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL, true);
 +        sDefaults.putBoolean(KEY_DISABLE_CDMA_ACTIVATION_CODE_BOOL, false);
 +        sDefaults.putBoolean(KEY_DTMF_TYPE_ENABLED_BOOL, false);
 +        sDefaults.putBoolean(KEY_ENABLE_DIALER_KEY_VIBRATION_BOOL, true);
 +        sDefaults.putBoolean(KEY_HAS_IN_CALL_NOISE_SUPPRESSION_BOOL, false);
 +        sDefaults.putBoolean(KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL, false);
 +        sDefaults.putBoolean(KEY_IGNORE_SIM_NETWORK_LOCKED_EVENTS_BOOL, false);
 +        sDefaults.putBoolean(KEY_OPERATOR_SELECTION_EXPAND_BOOL, true);
 +        sDefaults.putBoolean(KEY_PREFER_2G_BOOL, true);
 +        sDefaults.putBoolean(KEY_SHOW_APN_SETTING_CDMA_BOOL, false);
 +        sDefaults.putBoolean(KEY_SHOW_CDMA_CHOICES_BOOL, false);
 +        sDefaults.putBoolean(KEY_SHOW_ONSCREEN_DIAL_BUTTON_BOOL, true);
 +        sDefaults.putBoolean(KEY_SIM_NETWORK_UNLOCK_ALLOW_DISMISS_BOOL, true);
 +        sDefaults.putBoolean(KEY_SUPPORT_PAUSE_IMS_VIDEO_CALLS_BOOL, true);
 +        sDefaults.putBoolean(KEY_SUPPORT_SWAP_AFTER_MERGE_BOOL, true);
 +        sDefaults.putBoolean(KEY_USE_HFA_FOR_PROVISIONING_BOOL, false);
 +        sDefaults.putBoolean(KEY_USE_OTASP_FOR_PROVISIONING_BOOL, false);
 +        sDefaults.putBoolean(KEY_VOICEMAIL_NOTIFICATION_PERSISTENT_BOOL, false);
 +        sDefaults.putBoolean(KEY_VOICE_PRIVACY_DISABLE_BOOL, false);
 +        sDefaults.putBoolean(KEY_WORLD_PHONE_BOOL, false);
 +        sDefaults.putInt(KEY_VOLTE_REPLACEMENT_RAT_INT, 0);
 +        sDefaults.putString(KEY_VVM_DESTINATION_NUMBER_STRING, "");
 +        sDefaults.putInt(KEY_VVM_PORT_NUMBER_INT, 0);
 +        sDefaults.putString(KEY_VVM_TYPE_STRING, "");
 +        sDefaults.putString(KEY_CARRIER_VVM_PACKAGE_NAME_STRING, "");
+         sDefaults.putBoolean(BOOL_ALLOW_EMERGENCY_VIDEO_CALLS, false);
+         sDefaults.putBoolean(BOOL_ALLOW_VIDEO_PAUSE, true);
  
 -        sDefaults.putInt(INT_VOLTE_REPLACEMENT_RAT, 0);
 +        // MMS defaults
 +        sDefaults.putBoolean(KEY_MMS_ALIAS_ENABLED_BOOL, false);
 +        sDefaults.putBoolean(KEY_MMS_ALLOW_ATTACH_AUDIO_BOOL, true);
 +        sDefaults.putBoolean(KEY_MMS_APPEND_TRANSACTION_ID_BOOL, false);
 +        sDefaults.putBoolean(KEY_MMS_GROUP_MMS_ENABLED_BOOL, true);
 +        sDefaults.putBoolean(KEY_MMS_MMS_DELIVERY_REPORT_ENABLED_BOOL, false);
 +        sDefaults.putBoolean(KEY_MMS_MMS_ENABLED_BOOL, true);
 +        sDefaults.putBoolean(KEY_MMS_MMS_READ_REPORT_ENABLED_BOOL, false);
 +        sDefaults.putBoolean(KEY_MMS_MULTIPART_SMS_ENABLED_BOOL, true);
 +        sDefaults.putBoolean(KEY_MMS_NOTIFY_WAP_MMSC_ENABLED_BOOL, false);
 +        sDefaults.putBoolean(KEY_MMS_SEND_MULTIPART_SMS_AS_SEPARATE_MESSAGES_BOOL, false);
 +        sDefaults.putBoolean(KEY_MMS_SHOW_CELL_BROADCAST_APP_LINKS_BOOL, true);
 +        sDefaults.putBoolean(KEY_MMS_SMS_DELIVERY_REPORT_ENABLED_BOOL, true);
 +        sDefaults.putBoolean(KEY_MMS_SUPPORT_HTTP_CHARSET_HEADER_BOOL, false);
 +        sDefaults.putBoolean(KEY_MMS_SUPPORT_MMS_CONTENT_DISPOSITION_BOOL, true);
 +        sDefaults.putInt(KEY_MMS_ALIAS_MAX_CHARS_INT, 48);
 +        sDefaults.putInt(KEY_MMS_ALIAS_MIN_CHARS_INT, 2);
 +        sDefaults.putInt(KEY_MMS_HTTP_SOCKET_TIMEOUT_INT, 60 * 1000);
 +        sDefaults.putInt(KEY_MMS_MAX_IMAGE_HEIGHT_INT, 480);
 +        sDefaults.putInt(KEY_MMS_MAX_IMAGE_WIDTH_INT, 640);
 +        sDefaults.putInt(KEY_MMS_MAX_MESSAGE_SIZE_INT, 300 * 1024);
 +        sDefaults.putInt(KEY_MMS_MESSAGE_TEXT_MAX_SIZE_INT, -1);
 +        sDefaults.putInt(KEY_MMS_RECIPIENT_LIMIT_INT, Integer.MAX_VALUE);
 +        sDefaults.putInt(KEY_MMS_SMS_TO_MMS_TEXT_LENGTH_THRESHOLD_INT, -1);
 +        sDefaults.putInt(KEY_MMS_SMS_TO_MMS_TEXT_THRESHOLD_INT, -1);
 +        sDefaults.putInt(KEY_MMS_SUBJECT_MAX_LENGTH_INT, 40);
 +        sDefaults.putString(KEY_MMS_EMAIL_GATEWAY_NUMBER_STRING, "");
 +        sDefaults.putString(KEY_MMS_HTTP_PARAMS_STRING, "");
 +        sDefaults.putString(KEY_MMS_NAI_SUFFIX_STRING, "");
 +        sDefaults.putString(KEY_MMS_UA_PROF_TAG_NAME_STRING, "x-wap-profile");
 +        sDefaults.putString(KEY_MMS_UA_PROF_URL_STRING, "");
 +        sDefaults.putString(KEY_MMS_USER_AGENT_STRING, "");
      }
  
      /**