commit 740ad4f559b60beb8460f1130cc454c4d62ac475
author Pengquan Meng <mpq@google.com> Sat Oct 06 00:10:57 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Oct 06 00:10:57 2018 +0000
tree 266f98d175534f8e3578a94423168a98935afb18
parent 6ba6fb66175920997b0cf3d701eb7ba43cc932d3
parent efda661a08f5e5b87fa19fe5b31c977f31ae5680

Merge "Remove isCspPlmnEnabled from GsmOptions"

src/com/android/phone/GsmUmtsOptions.java

diff --git a/src/com/android/phone/GsmUmtsOptions.java b/src/com/android/phone/GsmUmtsOptions.java
index c6a299c..7f6207b 100644
--- a/src/com/android/phone/GsmUmtsOptions.java
+++ b/src/com/android/phone/GsmUmtsOptions.java
@@ -28,7 +28,6 @@
 
 import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneConstants;
 import com.android.settingslib.RestrictedLockUtilsInternal;
 
@@ -79,8 +78,6 @@
         boolean addCarrierSettings = true;
         final TelephonyManager telephonyManager = TelephonyManager.from(mPrefFragment.getContext())
                 .createForSubscriptionId(subId);
-        Phone phone = PhoneGlobals.getPhone(subId);
-        if (phone == null) return;
         if (telephonyManager.getPhoneType() != PhoneConstants.PHONE_TYPE_GSM) {
             log("Not a GSM phone");
             addAPNExpand = false;
@@ -104,7 +101,7 @@
             }
 
             if (carrierConfig.getBoolean(CarrierConfigManager.KEY_CSP_ENABLED_BOOL)) {
-                if (phone.isCspPlmnEnabled()) {
+                if (telephonyManager.isManualNetworkSelectionAllowed()) {
                     log("[CSP] Enabling Operator Selection menu.");
                     mNetworkOperator.setEnabled(true);
                 } else {