am aec8de6e: am 915d0a64: am cb8bb390: Merge "Add VVM carrier config to public API." into mnc-dev (b1056623) · Commits · e / os / android_frameworks_base

api/current.txt

+6 −0

Original line number	Diff line number	Diff line
		@@ -30626,6 +30626,7 @@ package android.telephony {
		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_CARRIER_VVM_PACKAGE_NAME_STRING = "carrier_vvm_package_name_string";
		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_CDMA_NONROAMING_NETWORKS_STRING_ARRAY = "cdma_nonroaming_networks_string_array";
		field public static final java.lang.String KEY_CDMA_ROAMING_NETWORKS_STRING_ARRAY = "cdma_roaming_networks_string_array";
		@@ -30683,6 +30684,9 @@ package android.telephony {
		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_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_DESTINATION_NUMBER_STRING = "vvm_destination_number_string";
		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_TYPE_STRING = "vvm_type_string";
		field public static final java.lang.String KEY_WORLD_PHONE_BOOL = "world_phone_bool";
		}

		@@ -31246,6 +31250,8 @@ package android.telephony {
		field public static final int SIM_STATE_PUK_REQUIRED = 3; // 0x3
		field public static final int SIM_STATE_READY = 5; // 0x5
		field public static final int SIM_STATE_UNKNOWN = 0; // 0x0
		field public static final java.lang.String VVM_TYPE_CVVM = "vvm_type_cvvm";
		field public static final java.lang.String VVM_TYPE_OMTP = "vvm_type_omtp";
		}

		}

api/system-current.txt

+6 −0

Original line number	Diff line number	Diff line
		@@ -32866,6 +32866,7 @@ package android.telephony {
		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_CARRIER_VVM_PACKAGE_NAME_STRING = "carrier_vvm_package_name_string";
		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_CDMA_NONROAMING_NETWORKS_STRING_ARRAY = "cdma_nonroaming_networks_string_array";
		field public static final java.lang.String KEY_CDMA_ROAMING_NETWORKS_STRING_ARRAY = "cdma_roaming_networks_string_array";
		@@ -32923,6 +32924,9 @@ package android.telephony {
		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_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_DESTINATION_NUMBER_STRING = "vvm_destination_number_string";
		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_TYPE_STRING = "vvm_type_string";
		field public static final java.lang.String KEY_WORLD_PHONE_BOOL = "world_phone_bool";
		}

		@@ -33535,6 +33539,8 @@ package android.telephony {
		field public static final int SIM_STATE_PUK_REQUIRED = 3; // 0x3
		field public static final int SIM_STATE_READY = 5; // 0x5
		field public static final int SIM_STATE_UNKNOWN = 0; // 0x0
		field public static final java.lang.String VVM_TYPE_CVVM = "vvm_type_cvvm";
		field public static final java.lang.String VVM_TYPE_OMTP = "vvm_type_omtp";
		}

		}

telephony/java/android/telephony/CarrierConfigManager.java

+2 −10

Original line number	Diff line number	Diff line
		@@ -249,32 +249,24 @@ public class CarrierConfigManager {
		/* The following 3 fields are related to carrier visual voicemail. */

		/**
		* The carrier number MO sms messages are sent to.
		*
		* @hide
		* The carrier number mobile outgoing (MO) sms messages are sent to.
		*/
		public static final String KEY_VVM_DESTINATION_NUMBER_STRING = "vvm_destination_number_string";

		/**
		* The port through which the MO sms messages are sent through.
		*
		* @hide
		* The port through which the mobile outgoing (MO) sms messages are sent through.
		*/
		public static final String KEY_VVM_PORT_NUMBER_INT = "vvm_port_number_int";

		/**
		* The type of visual voicemail protocol the carrier adheres to. See {@link TelephonyManager}
		* for possible values. For example {@link TelephonyManager#VVM_TYPE_OMTP}.
		*
		* @hide
		*/
		public static final String KEY_VVM_TYPE_STRING = "vvm_type_string";

		/**
		* 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.
		*
		* @hide
		*/
		public static final String KEY_CARRIER_VVM_PACKAGE_NAME_STRING = "carrier_vvm_package_name_string";

telephony/java/android/telephony/TelephonyManager.java

+1 −5

Original line number	Diff line number	Diff line
		@@ -616,15 +616,11 @@ public class TelephonyManager {

		/**
		* The OMTP protocol.
		*
		* @hide
		*/
		public static final String VVM_TYPE_OMTP = "vvm_type_omtp";

		/**
		* A flavor of OMTP protocol for Comverse.
		*
		* @hide
		* A flavor of OMTP protocol with a different mobile originated (MO) format
		*/
		public static final String VVM_TYPE_CVVM = "vvm_type_cvvm";