commit 7f726bc5c2b0e36afa0b90b08ec83c84d7085676
author PauloftheWest <paulofthewest@google.com> Wed Dec 03 21:34:31 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 03 21:34:32 2014 +0000
tree 0fe4638ddd0990b60021a5abe7381b64b9b2138e
parent a82b820e69f41585c3a2b76678040b93fdf54886
parent 5236f3ae1e7b4d2b07079fbf12b1666a82e1099c

Merge "Enabled APNs option for Verizon SIMs" into lmp-mr1-dev

src/com/android/phone/MobileNetworkSettings.java

diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
index 1c82c29..ff3f066 100644
--- a/src/com/android/phone/MobileNetworkSettings.java
+++ b/src/com/android/phone/MobileNetworkSettings.java
@@ -1050,7 +1050,7 @@
             return;
         }
 
-        if (enable && mGsmUmtsOptions == null) {
+        if (mGsmUmtsOptions == null) {
             mGsmUmtsOptions = new GsmUmtsOptions(this, prefSet);
         }
         PreferenceScreen apnExpand =
@@ -1060,7 +1060,7 @@
         PreferenceScreen carrierSettings =
                 (PreferenceScreen) prefSet.findPreference(BUTTON_CARRIER_SETTINGS_KEY);
         if (apnExpand != null) {
-            apnExpand.setEnabled(enable);
+            apnExpand.setEnabled(isWorldMode() || enable);
         }
         if (operatorSelectionExpand != null) {
             operatorSelectionExpand.setEnabled(enable);