summaryrefslogtreecommitdiffstats
path: root/telephony/java
diff options
context:
space:
mode:
authorTyler Gunn <tgunn@google.com>2015-08-20 17:28:14 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-20 17:28:14 +0000
commit51e8df2ee64ba605e6695279a8aab987b2a56903 (patch)
tree5b3977a93257948a6efd5788b338f80369d9042a /telephony/java
parentedf93764f09357f6062eee2e4da8da925247834a (diff)
parenta001f7ae7fde0418a6f8e455f88a2d7dc3c392ce (diff)
downloadframeworks_base-51e8df2ee64ba605e6695279a8aab987b2a56903.zip
frameworks_base-51e8df2ee64ba605e6695279a8aab987b2a56903.tar.gz
frameworks_base-51e8df2ee64ba605e6695279a8aab987b2a56903.tar.bz2
am a001f7ae: Merge "Add carrier config variable to hide merge call button" into mnc-dr-dev
* commit 'a001f7ae7fde0418a6f8e455f88a2d7dc3c392ce': Add carrier config variable to hide merge call button
Diffstat (limited to 'telephony/java')
-rw-r--r--telephony/java/android/telephony/CarrierConfigManager.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 3054422..9dc94c8 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -350,6 +350,13 @@ public class CarrierConfigManager {
public static final String KEY_IMS_DTMF_TONE_DELAY_INT = "ims_dtmf_tone_delay_int";
/**
+ * Determines whether conference calls are supported by a carrier. When {@code true},
+ * conference calling is supported, {@code false otherwise}.
+ * @hide
+ */
+ public static final String KEY_SUPPORT_CONFERENCE_CALL_BOOL = "support_conference_call_bool";
+
+ /**
* 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
@@ -448,6 +455,7 @@ public class CarrierConfigManager {
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);
+ sDefaults.putBoolean(KEY_SUPPORT_CONFERENCE_CALL_BOOL, true);
// MMS defaults
sDefaults.putBoolean(KEY_MMS_ALIAS_ENABLED_BOOL, false);