summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorRoshan Pius <rpius@google.com>2015-08-12 23:17:27 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-12 23:17:27 +0000
commit289ecbbfafbb73ccf00e14ea8e2f6584406b50fe (patch)
tree2b5c605303e4b7ee1a6a63c381623691471888da /telephony
parent855a862f6d1ef1af1b16c21d67645b5141db94fc (diff)
parent737aed41ca9d8bad425ed8223fa4e4c84c7b102c (diff)
downloadframeworks_base-289ecbbfafbb73ccf00e14ea8e2f6584406b50fe.zip
frameworks_base-289ecbbfafbb73ccf00e14ea8e2f6584406b50fe.tar.gz
frameworks_base-289ecbbfafbb73ccf00e14ea8e2f6584406b50fe.tar.bz2
am 737aed41: Merge "Add a new carrier config for DTMF tone gap." into mnc-dr-dev
* commit '737aed41ca9d8bad425ed8223fa4e4c84c7b102c': Add a new carrier config for DTMF tone gap.
Diffstat (limited to 'telephony')
-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 b5e4342..3054422 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -342,6 +342,14 @@ 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.
+ * @hide
+ */
+ public static final String KEY_IMS_DTMF_TONE_DELAY_INT = "ims_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
@@ -439,6 +447,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_IMS_DTMF_TONE_DELAY_INT, 0);
// MMS defaults
sDefaults.putBoolean(KEY_MMS_ALIAS_ENABLED_BOOL, false);