Merge "Extend carrier configs for visual voicemail" (f4db619b) · Commits · e / os / android_frameworks_base

api/current.txt

+6 −1

Original line number	Diff line number	Diff line
		@@ -37589,7 +37589,8 @@ package android.telephony {
		field public static final java.lang.String KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOL = "carrier_volte_provisioning_required_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_CARRIER_VT_AVAILABLE_BOOL = "carrier_vt_available_bool";
		field public static final java.lang.String KEY_CARRIER_VVM_PACKAGE_NAME_STRING = "carrier_vvm_package_name_string";
		field public static final deprecated java.lang.String KEY_CARRIER_VVM_PACKAGE_NAME_STRING = "carrier_vvm_package_name_string";
		field public static final java.lang.String KEY_CARRIER_VVM_PACKAGE_NAME_STRING_ARRAY = "carrier_vvm_package_name_string_array";
		field public static final java.lang.String KEY_CARRIER_WFC_IMS_AVAILABLE_BOOL = "carrier_wfc_ims_available_bool";
		field public static final java.lang.String KEY_CARRIER_WFC_SUPPORTS_WIFI_ONLY_BOOL = "carrier_wfc_supports_wifi_only_bool";
		field public static final java.lang.String KEY_CDMA_DTMF_TONE_DELAY_INT = "cdma_dtmf_tone_delay_int";
		@@ -37673,9 +37674,13 @@ package android.telephony {
		field public static final java.lang.String KEY_VOICE_PRIVACY_DISABLE_UI_BOOL = "voice_privacy_disable_ui_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_VVM_CELLULAR_DATA_REQUIRED_BOOL = "vvm_cellular_data_required_bool";
		field public static final java.lang.String KEY_VVM_CLIENT_PREFIX_STRING = "vvm_client_prefix_string";
		field public static final java.lang.String KEY_VVM_DESTINATION_NUMBER_STRING = "vvm_destination_number_string";
		field public static final java.lang.String KEY_VVM_DISABLED_CAPABILITIES_STRING_ARRAY = "vvm_disabled_capabilities_string_array";
		field public static final java.lang.String KEY_VVM_LEGACY_MODE_ENABLED_BOOL = "vvm_legacy_mode_enabled_bool";
		field public static final java.lang.String KEY_VVM_PORT_NUMBER_INT = "vvm_port_number_int";
		field public static final java.lang.String KEY_VVM_PREFETCH_BOOL = "vvm_prefetch_bool";
		field public static final java.lang.String KEY_VVM_SSL_ENABLED_BOOL = "vvm_ssl_enabled_bool";
		field public static final java.lang.String KEY_VVM_TYPE_STRING = "vvm_type_string";
		field public static final java.lang.String KEY_WORLD_PHONE_BOOL = "world_phone_bool";
		}

api/system-current.txt

+6 −1

Original line number	Diff line number	Diff line
		@@ -40762,7 +40762,8 @@ package android.telephony {
		field public static final java.lang.String KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOL = "carrier_volte_provisioning_required_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_CARRIER_VT_AVAILABLE_BOOL = "carrier_vt_available_bool";
		field public static final java.lang.String KEY_CARRIER_VVM_PACKAGE_NAME_STRING = "carrier_vvm_package_name_string";
		field public static final deprecated java.lang.String KEY_CARRIER_VVM_PACKAGE_NAME_STRING = "carrier_vvm_package_name_string";
		field public static final java.lang.String KEY_CARRIER_VVM_PACKAGE_NAME_STRING_ARRAY = "carrier_vvm_package_name_string_array";
		field public static final java.lang.String KEY_CARRIER_WFC_IMS_AVAILABLE_BOOL = "carrier_wfc_ims_available_bool";
		field public static final java.lang.String KEY_CARRIER_WFC_SUPPORTS_WIFI_ONLY_BOOL = "carrier_wfc_supports_wifi_only_bool";
		field public static final java.lang.String KEY_CDMA_DTMF_TONE_DELAY_INT = "cdma_dtmf_tone_delay_int";
		@@ -40846,9 +40847,13 @@ package android.telephony {
		field public static final java.lang.String KEY_VOICE_PRIVACY_DISABLE_UI_BOOL = "voice_privacy_disable_ui_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_VVM_CELLULAR_DATA_REQUIRED_BOOL = "vvm_cellular_data_required_bool";
		field public static final java.lang.String KEY_VVM_CLIENT_PREFIX_STRING = "vvm_client_prefix_string";
		field public static final java.lang.String KEY_VVM_DESTINATION_NUMBER_STRING = "vvm_destination_number_string";
		field public static final java.lang.String KEY_VVM_DISABLED_CAPABILITIES_STRING_ARRAY = "vvm_disabled_capabilities_string_array";
		field public static final java.lang.String KEY_VVM_LEGACY_MODE_ENABLED_BOOL = "vvm_legacy_mode_enabled_bool";
		field public static final java.lang.String KEY_VVM_PORT_NUMBER_INT = "vvm_port_number_int";
		field public static final java.lang.String KEY_VVM_PREFETCH_BOOL = "vvm_prefetch_bool";
		field public static final java.lang.String KEY_VVM_SSL_ENABLED_BOOL = "vvm_ssl_enabled_bool";
		field public static final java.lang.String KEY_VVM_TYPE_STRING = "vvm_type_string";
		field public static final java.lang.String KEY_WORLD_PHONE_BOOL = "world_phone_bool";
		}

api/test-current.txt

+6 −1

Original line number	Diff line number	Diff line
		@@ -37688,7 +37688,8 @@ package android.telephony {
		field public static final java.lang.String KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOL = "carrier_volte_provisioning_required_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_CARRIER_VT_AVAILABLE_BOOL = "carrier_vt_available_bool";
		field public static final java.lang.String KEY_CARRIER_VVM_PACKAGE_NAME_STRING = "carrier_vvm_package_name_string";
		field public static final deprecated java.lang.String KEY_CARRIER_VVM_PACKAGE_NAME_STRING = "carrier_vvm_package_name_string";
		field public static final java.lang.String KEY_CARRIER_VVM_PACKAGE_NAME_STRING_ARRAY = "carrier_vvm_package_name_string_array";
		field public static final java.lang.String KEY_CARRIER_WFC_IMS_AVAILABLE_BOOL = "carrier_wfc_ims_available_bool";
		field public static final java.lang.String KEY_CARRIER_WFC_SUPPORTS_WIFI_ONLY_BOOL = "carrier_wfc_supports_wifi_only_bool";
		field public static final java.lang.String KEY_CDMA_DTMF_TONE_DELAY_INT = "cdma_dtmf_tone_delay_int";
		@@ -37772,9 +37773,13 @@ package android.telephony {
		field public static final java.lang.String KEY_VOICE_PRIVACY_DISABLE_UI_BOOL = "voice_privacy_disable_ui_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_VVM_CELLULAR_DATA_REQUIRED_BOOL = "vvm_cellular_data_required_bool";
		field public static final java.lang.String KEY_VVM_CLIENT_PREFIX_STRING = "vvm_client_prefix_string";
		field public static final java.lang.String KEY_VVM_DESTINATION_NUMBER_STRING = "vvm_destination_number_string";
		field public static final java.lang.String KEY_VVM_DISABLED_CAPABILITIES_STRING_ARRAY = "vvm_disabled_capabilities_string_array";
		field public static final java.lang.String KEY_VVM_LEGACY_MODE_ENABLED_BOOL = "vvm_legacy_mode_enabled_bool";
		field public static final java.lang.String KEY_VVM_PORT_NUMBER_INT = "vvm_port_number_int";
		field public static final java.lang.String KEY_VVM_PREFETCH_BOOL = "vvm_prefetch_bool";
		field public static final java.lang.String KEY_VVM_SSL_ENABLED_BOOL = "vvm_ssl_enabled_bool";
		field public static final java.lang.String KEY_VVM_TYPE_STRING = "vvm_type_string";
		field public static final java.lang.String KEY_WORLD_PHONE_BOOL = "world_phone_bool";
		}

telephony/java/android/telephony/CarrierConfigManager.java

+47 −0

Original line number	Diff line number	Diff line
		@@ -603,6 +603,38 @@ public class CarrierConfigManager {
		public static final String KEY_VVM_CELLULAR_DATA_REQUIRED_BOOL =
		"vvm_cellular_data_required_bool";

		/**
		* The default OMTP visual voicemail client prefix to use. Defaulted to "//VVM"
		*/
		public static final String KEY_VVM_CLIENT_PREFIX_STRING =
		"vvm_client_prefix_string";

		/**
		* Whether to use SSL to connect to the visual voicemail IMAP server. Defaulted to false.
		*/
		public static final String KEY_VVM_SSL_ENABLED_BOOL = "vvm_ssl_enabled_bool";

		/**
		* A set of capabilities that should not be used even if it is reported by the visual voicemail
		* IMAP CAPABILITY command.
		*/
		public static final String KEY_VVM_DISABLED_CAPABILITIES_STRING_ARRAY =
		"vvm_disabled_capabilities_string_array";

		/**
		* Whether legacy mode should be used when the visual voicemail client is disabled.
		*
		* <p>Legacy mode is a mode that on the carrier side visual voicemail is still activated, but on
		* the client side all network operations are disabled. SMSs are still monitored so a new
		* message SYNC SMS will be translated to show a message waiting indicator, like traditional
		* voicemails.
		*
		* <p>This is for carriers that does not support VVM deactivation so voicemail can continue to
		* function without the data cost.
		*/
		public static final String KEY_VVM_LEGACY_MODE_ENABLED_BOOL =
		"vvm_legacy_mode_enabled_bool";

		/**
		* Whether to prefetch audio data on new voicemail arrival, defaulted to true.
		*/
		@@ -611,9 +643,19 @@ public class CarrierConfigManager {
		/**
		* The package name of the carrier's visual voicemail app to ensure that dialer visual voicemail
		* and carrier visual voicemail are not active at the same time.
		*
		* @deprecated use {@link #KEY_CARRIER_VVM_PACKAGE_NAME_STRING_ARRAY}.
		*/
		@Deprecated
		public static final String KEY_CARRIER_VVM_PACKAGE_NAME_STRING = "carrier_vvm_package_name_string";

		/**
		* A list of the carrier's visual voicemail app package names to ensure that dialer visual
		* voicemail and carrier visual voicemail are not active at the same time.
		*/
		public static final String KEY_CARRIER_VVM_PACKAGE_NAME_STRING_ARRAY =
		"carrier_vvm_package_name_string_array";

		/**
		* Flag specifying whether ICCID is showed in SIM Status screen, default to false.
		*/
		@@ -1344,8 +1386,13 @@ public class CarrierConfigManager {
		sDefaults.putInt(KEY_VVM_PORT_NUMBER_INT, 0);
		sDefaults.putString(KEY_VVM_TYPE_STRING, "");
		sDefaults.putBoolean(KEY_VVM_CELLULAR_DATA_REQUIRED_BOOL, false);
		sDefaults.putString(KEY_VVM_CLIENT_PREFIX_STRING,"//VVM");
		sDefaults.putBoolean(KEY_VVM_SSL_ENABLED_BOOL,false);
		sDefaults.putStringArray(KEY_VVM_DISABLED_CAPABILITIES_STRING_ARRAY, null);
		sDefaults.putBoolean(KEY_VVM_LEGACY_MODE_ENABLED_BOOL,false);
		sDefaults.putBoolean(KEY_VVM_PREFETCH_BOOL, true);
		sDefaults.putString(KEY_CARRIER_VVM_PACKAGE_NAME_STRING, "");
		sDefaults.putStringArray(KEY_CARRIER_VVM_PACKAGE_NAME_STRING_ARRAY, null);
		sDefaults.putBoolean(KEY_SHOW_ICCID_IN_SIM_STATUS_BOOL, false);
		sDefaults.putBoolean(KEY_CI_ACTION_ON_SYS_UPDATE_BOOL, false);
		sDefaults.putString(KEY_CI_ACTION_ON_SYS_UPDATE_INTENT_STRING, "");