Merge "DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA." into mnc-dr-dev (a5917b71) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/CarrierConfigManager.java

+12 −3

Original line number	Diff line number	Diff line
		@@ -380,9 +380,9 @@ public class CarrierConfigManager {
		"ci_action_on_sys_update_extra_val_string";

		/**
		* Specifies the amount of gap to be added in millis between DTMF tones. When a non-zero value
		* is specified, the UE shall wait for the specified amount of time before it sends out
		* successive DTMF tones on the network.
		* Specifies the amount of gap to be added in millis between postdial DTMF tones. When a
		* non-zero value is specified, the UE shall wait for the specified amount of time before it
		* sends out successive DTMF tones on the network.
		* @hide
		*/
		public static final String KEY_GSM_DTMF_TONE_DELAY_INT = "gsm_dtmf_tone_delay_int";
		@@ -420,6 +420,14 @@ public class CarrierConfigManager {
		*/
		public static final String KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL = "hide_preferred_network_type_bool";

		/**
		* Specifies the amount of gap to be added in millis between postdial DTMF tones. When a
		* non-zero value is specified, the UE shall wait for the specified amount of time before it
		* sends out successive DTMF tones on the network.
		* @hide
		*/
		public static final String KEY_CDMA_DTMF_TONE_DELAY_INT = "cdma_dtmf_tone_delay_int";

		/**
		* If this is true, the SIM card (through Customer Service Profile EF file) will be able to
		* prevent manual operator selection. If false, this SIM setting will be ignored and manual
		@@ -544,6 +552,7 @@ public class CarrierConfigManager {
		sDefaults.putBoolean(KEY_EDITABLE_ENHANCED_4G_LTE_BOOL, true);
		sDefaults.putBoolean(KEY_HIDE_IMS_APN_BOOL, false);
		sDefaults.putBoolean(KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL, false);
		sDefaults.putInt(KEY_CDMA_DTMF_TONE_DELAY_INT, 100);

		// MMS defaults
		sDefaults.putBoolean(KEY_MMS_ALIAS_ENABLED_BOOL, false);