summaryrefslogtreecommitdiffstats
path: root/telephony/java
diff options
context:
space:
mode:
authorVineeta Srivastava <vsrivastava@google.com>2015-09-09 17:12:39 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-09-09 17:12:39 +0000
commitebd1465885af2a1de5a885dac791ee6184f85d7f (patch)
treea601b024ae2624739c315e03ecb6ed0b4d7dc186 /telephony/java
parentdee1c5c948a5e1b98577a3301882aac04154b5be (diff)
parente9d3c11ccd3b47d8da93f135c500b2bed30728e9 (diff)
downloadframeworks_base-ebd1465885af2a1de5a885dac791ee6184f85d7f.zip
frameworks_base-ebd1465885af2a1de5a885dac791ee6184f85d7f.tar.gz
frameworks_base-ebd1465885af2a1de5a885dac791ee6184f85d7f.tar.bz2
Merge "Add carrier config variable to hide ims apn" into mnc-dr-dev
Diffstat (limited to 'telephony/java')
-rw-r--r--telephony/java/android/telephony/CarrierConfigManager.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 8889ca9..135a97a 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -373,6 +373,12 @@ public class CarrierConfigManager {
public static final String KEY_EDITABLE_ENHANCED_4G_LTE_BOOL = "editable_enhanced_4g_lte_bool";
/**
+ * Determine whether IMS apn can be shown.
+ * @hide
+ */
+ public static final String KEY_HIDE_IMS_APN_BOOL = "hide_ims_apn_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
@@ -483,6 +489,7 @@ public class CarrierConfigManager {
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);
+ sDefaults.putBoolean(KEY_HIDE_IMS_APN_BOOL, false);
// MMS defaults
sDefaults.putBoolean(KEY_MMS_ALIAS_ENABLED_BOOL, false);