commit 905a466c5a52750307340ec4fe3ce39ef16ef75c
author Pengquan Meng <mpq@google.com> Thu Oct 04 18:12:08 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 04 18:12:08 2018 +0000
tree bef73586f54253d57dd7ffa4a57c40eb9db600f2
parent c7e9879d598447bfc6f22d57ec4e319c389aa297
parent 6884a2c22b0a5e0bbc2de81b5e8b5a8b77197803

Merge "Add isManualNetworkSelectionAllowed api"

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 8ac58b2..f2bc7d3 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -4991,6 +4991,23 @@
     }
 
     @Override
+    public boolean isManualNetworkSelectionAllowed(int subId) {
+        boolean isAllowed = true;
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            TelephonyPermissions.enforeceCallingOrSelfReadPhoneStatePermissionOrCarrierPrivilege(
+                    mApp, subId, "isManualNetworkSelectionAllowed");
+            Phone phone = getPhone(subId);
+            if (phone != null) {
+                isAllowed = phone.isCspPlmnEnabled();
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+        return isAllowed;
+    }
+
+    @Override
     public UiccSlotInfo[] getUiccSlotsInfo() {
         enforceReadPrivilegedPermission();