commit 07d04774dac30bf11523de1f4bea710ce276c207
author Pavel Zhamaitsiak <pavelz@google.com> Sat Aug 29 23:09:57 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Aug 29 23:09:57 2015 +0000
tree 0754a729969610bcdf4a10de807eb875145ac843
parent 67953778546ab2ac3dfbc4aa61b236895fd1ac2b
parent 59f3c3429bf61ff4eb6f5d16abba01cb58cc5ee9

am 59f3c342: am 6611cff4: am d9efca99: Merge "Support uneditable enhanced 4g lte mode config" into mnc-dr-dev

* commit '59f3c3429bf61ff4eb6f5d16abba01cb58cc5ee9':
  Support uneditable enhanced 4g lte mode config

telephony/java/android/telephony/CarrierConfigManager.java

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 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 @@
         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);