commit 11cb4564f79e1bd4b68fe12e3b4e8397e8c7c770
author yinxu <yinxu@google.com> Tue Mar 14 15:35:16 2017 -0700
committer yinxu <yinxu@google.com> Mon Apr 03 15:22:15 2017 -0700
tree 8b2b9efbedfdd48915d9cbc294b1d696332e68b6
parent 9370f24e801d8ad6d8e08be1f20301fe15301b55

Hide the option of "Enhanced 4G LTE Mode" when the key "KEY_HIDE_ENHANCED_4G_LTE_BOOL" is true.

Bug: 36220377
Test: manual
Change-Id: I34e709a23652f98290760375d0e26c836966a944
(cherry picked from commit 0feafa78a8cbacac5a735dbf0a4153058ca60007)

src/com/android/phone/MobileNetworkSettings.java

diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
index d023b20..8d58107 100644
--- a/src/com/android/phone/MobileNetworkSettings.java
+++ b/src/com/android/phone/MobileNetworkSettings.java
@@ -711,9 +711,10 @@
                 android.util.Log.d(LOG_TAG, "keep ltePref");
             }
 
-            // Enable enhanced 4G LTE mode settings depending on whether exists on platform
             if (!(ImsManager.isVolteEnabledByPlatform(getActivity())
-                    && ImsManager.isVolteProvisionedOnDevice(getActivity()))) {
+                    && ImsManager.isVolteProvisionedOnDevice(getActivity()))
+                    || carrierConfig.getBoolean(
+                        CarrierConfigManager.KEY_HIDE_ENHANCED_4G_LTE_BOOL)) {
                 Preference pref = prefSet.findPreference(BUTTON_4G_LTE_KEY);
                 if (pref != null) {
                     prefSet.removePreference(pref);