diff options
| author | Tyler Gunn <tgunn@google.com> | 2015-10-16 17:40:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-16 17:40:19 +0000 |
| commit | 95b84f52517548adbd0dff7a22c41c5c4d249c44 (patch) | |
| tree | 0d0ed72b813f109c224e0ca6ba1fe9094547a52b /telephony | |
| parent | a3234f01927e6908cc4e08ddcff9c1646d5a91bb (diff) | |
| parent | a5917b71b0e2f98fa6906b795b28cab059cc092b (diff) | |
| download | frameworks_base-95b84f52517548adbd0dff7a22c41c5c4d249c44.zip frameworks_base-95b84f52517548adbd0dff7a22c41c5c4d249c44.tar.gz frameworks_base-95b84f52517548adbd0dff7a22c41c5c4d249c44.tar.bz2 | |
am a5917b71: Merge "DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA." into mnc-dr-dev
* commit 'a5917b71b0e2f98fa6906b795b28cab059cc092b':
DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA.
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 744028a..cc9003f 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -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"; @@ -421,6 +421,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 * operator selection will always be available. See CPHS4_2.WW6, CPHS B.4.7.1 for more @@ -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); |