summaryrefslogtreecommitdiffstats
path: root/telephony/java/android
diff options
context:
space:
mode:
authorPavel Zhamaitsiak <pavelz@google.com>2015-08-29 22:44:41 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-29 22:44:41 +0000
commit6611cff402f0edeff85e7a9e6fedc6eeb8f8b1f1 (patch)
tree9fbd495a80d5f982c6fb733e59a829d080bf5dc5 /telephony/java/android
parent8038391a0841f6a038a9dd3592675e794678835b (diff)
parentd9efca994f99523288986f29128d696440ee4150 (diff)
downloadframeworks_base-6611cff402f0edeff85e7a9e6fedc6eeb8f8b1f1.zip
frameworks_base-6611cff402f0edeff85e7a9e6fedc6eeb8f8b1f1.tar.gz
frameworks_base-6611cff402f0edeff85e7a9e6fedc6eeb8f8b1f1.tar.bz2
am d9efca99: Merge "Support uneditable enhanced 4g lte mode config" into mnc-dr-dev
* commit 'd9efca994f99523288986f29128d696440ee4150': Support uneditable enhanced 4g lte mode config
Diffstat (limited to 'telephony/java/android')
-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 9dc94c8..6a0bf64 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -357,6 +357,12 @@ public class CarrierConfigManager {
public static final String KEY_SUPPORT_CONFERENCE_CALL_BOOL = "support_conference_call_bool";
/**
+ * Determine whether user can toggle Enhanced 4G LTE Mode in Settings.
+ * @hide
+ */
+ public static final String KEY_EDITABLE_ENHANCED_4G_LTE_BOOL = "editable_enhanced_4g_lte_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
@@ -456,6 +462,7 @@ public class CarrierConfigManager {
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);
+ sDefaults.putBoolean(KEY_EDITABLE_ENHANCED_4G_LTE_BOOL, true);
// MMS defaults
sDefaults.putBoolean(KEY_MMS_ALIAS_ENABLED_BOOL, false);