commit 4c74cad4dd72683f9a1fa6b47d102f39c5c49b47
author Pavel Zhamaitsiak <pavelz@google.com> Sat Aug 29 22:39:48 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Aug 29 22:39:48 2015 +0000
tree b7dc8b9a1ed4315120ba83e8416ae71db5190a50
parent 467219b92402b2fc94bc277caaed9fa3c9b3b2d5
parent 9567c75e8c30f96bc9ddf63220782c4de6157f5c

am 9567c75e: Merge "Support uneditable enhanced 4g lte mode" into mnc-dr-dev

* commit '9567c75e8c30f96bc9ddf63220782c4de6157f5c':
  Support uneditable enhanced 4g lte mode

src/com/android/phone/MobileNetworkSettings.java

diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
index cf928ae..a457c47 100644
--- a/src/com/android/phone/MobileNetworkSettings.java
+++ b/src/com/android/phone/MobileNetworkSettings.java
@@ -713,7 +713,8 @@
         TelephonyManager tm = (TelephonyManager) getSystemService(
                 Context.TELEPHONY_SERVICE);
         boolean canChange4glte = (tm.getCallState() == TelephonyManager.CALL_STATE_IDLE) &&
-                ImsManager.isNonTtyOrTtyOnVolteEnabled(getApplicationContext());
+                ImsManager.isNonTtyOrTtyOnVolteEnabled(getApplicationContext()) &&
+                carrierConfig.getBoolean(CarrierConfigManager.KEY_EDITABLE_ENHANCED_4G_LTE_BOOL);
         mButtonDataRoam.setEnabled(hasActiveSubscriptions);
         mButtonPreferredNetworkMode.setEnabled(hasActiveSubscriptions);
         mButtonEnabledNetworks.setEnabled(hasActiveSubscriptions);