summaryrefslogtreecommitdiffstats
path: root/telephony/java/android
diff options
context:
space:
mode:
authorRoshan Pius <rpius@google.com>2015-09-11 06:18:33 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-11 06:18:33 +0000
commite3d006b1abce25b9c0163e0471830ad5d01c3670 (patch)
tree93a50016144b8ce9e92ad6c8c93c96aa1b07c709 /telephony/java/android
parenta58bff50418933ee5b729deccdf8172132b560f5 (diff)
parent0a067dc711b19a70ad5980fa360b2df2337a55b1 (diff)
downloadframeworks_base-e3d006b1abce25b9c0163e0471830ad5d01c3670.zip
frameworks_base-e3d006b1abce25b9c0163e0471830ad5d01c3670.tar.gz
frameworks_base-e3d006b1abce25b9c0163e0471830ad5d01c3670.tar.bz2
am 0a067dc7: Merge "Add a new carrier config for DTMF tone gap." into mnc-dr-dev
* commit '0a067dc711b19a70ad5980fa360b2df2337a55b1': Add a new carrier config for DTMF tone gap.
Diffstat (limited to 'telephony/java/android')
-rw-r--r--telephony/java/android/telephony/CarrierConfigManager.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 4a04cf1..e675c6d 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -357,6 +357,14 @@ public class CarrierConfigManager {
* successive DTMF tones on the network.
* @hide
*/
+ public static final String KEY_GSM_DTMF_TONE_DELAY_INT = "gsm_dtmf_tone_delay_int";
+
+ /**
+ * 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.
+ * @hide
+ */
public static final String KEY_IMS_DTMF_TONE_DELAY_INT = "ims_dtmf_tone_delay_int";
/**
@@ -492,6 +500,7 @@ public class CarrierConfigManager {
sDefaults.putStringArray(KEY_CDMA_ROAMING_NETWORKS_STRING_ARRAY, null);
sDefaults.putStringArray(KEY_CDMA_NONROAMING_NETWORKS_STRING_ARRAY, null);
sDefaults.putBoolean(KEY_FORCE_HOME_NETWORK_BOOL, false);
+ sDefaults.putInt(KEY_GSM_DTMF_TONE_DELAY_INT, 0);
sDefaults.putInt(KEY_IMS_DTMF_TONE_DELAY_INT, 0);
sDefaults.putBoolean(KEY_SUPPORT_CONFERENCE_CALL_BOOL, true);
sDefaults.putBoolean(KEY_EDITABLE_ENHANCED_4G_LTE_BOOL, true);