summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorPavel Zhamaitsiak <pavelz@google.com>2015-10-21 00:32:10 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-10-21 00:32:10 +0000
commitd91b1f6bb84c22b9b20df2537500bf23f6b65ad2 (patch)
tree60217d6f5245a79acf1e5e9d3f0c1deda52cb382 /telephony
parent894dd2b078a5808704f462023c8fcb00b5579ef0 (diff)
parentd99aade6e2c001cbb8e32c9342f20404bd614443 (diff)
downloadframeworks_base-d91b1f6bb84c22b9b20df2537500bf23f6b65ad2.zip
frameworks_base-d91b1f6bb84c22b9b20df2537500bf23f6b65ad2.tar.gz
frameworks_base-d91b1f6bb84c22b9b20df2537500bf23f6b65ad2.tar.bz2
Merge "Carrier Config: Add KEY_CARRIER_IMS_GBA_REQUIRED_BOOL flag" into mnc-dr-dev
am: d99aade6e2 * commit 'd99aade6e2c001cbb8e32c9342f20404bd614443': Carrier Config: Add KEY_CARRIER_IMS_GBA_REQUIRED_BOOL flag
Diffstat (limited to 'telephony')
-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 cc9003f..29e54a3 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -268,6 +268,13 @@ public class CarrierConfigManager {
= "carrier_allow_turnoff_ims_bool";
/**
+ * Flag specifying whether Generic Bootstrapping Architecture capable SIM is required for IMS.
+ * @hide
+ */
+ public static final String KEY_CARRIER_IMS_GBA_REQUIRED_BOOL
+ = "carrier_ims_gba_required_bool";
+
+ /**
* Flag specifying whether IMS instant lettering is available for the carrier. {@code True} if
* instant lettering is available for the carrier, {@code false} otherwise.
* @hide
@@ -503,6 +510,7 @@ public class CarrierConfigManager {
sDefaults.putBoolean(KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOL, false);
sDefaults.putBoolean(KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL, true);
sDefaults.putBoolean(KEY_CARRIER_ALLOW_TURNOFF_IMS_BOOL, true);
+ sDefaults.putBoolean(KEY_CARRIER_IMS_GBA_REQUIRED_BOOL, false);
sDefaults.putBoolean(KEY_CARRIER_INSTANT_LETTERING_AVAILABLE_BOOL, false);
sDefaults.putString(KEY_CARRIER_INSTANT_LETTERING_INVALID_CHARS_STRING, "");
sDefaults.putString(KEY_CARRIER_INSTANT_LETTERING_ESCAPED_CHARS_STRING, "");