commit 312de0c42f9adc9761ba6b427532864e0c30ddd4
author Pengquan Meng <mpq@google.com> Wed Oct 03 12:19:13 2018 -0700
committer Pengquan Meng <mpq@google.com> Mon Oct 08 19:09:15 2018 +0000
tree ce07f90a25875f63699ad8a10cf1e42a1ced1ae2
parent 9358dee24529510a57a2619f010f83328a305e7e

Add isManualNetworkSelectionAllowed api

Bug: 111453847
Test: build
Merged-In: I01c66d0fafb1fd0a50a66c8a3d3a66cf509494c9
Change-Id: I01c66d0fafb1fd0a50a66c8a3d3a66cf509494c9

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index cef0e53..8866d30 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -4980,6 +4980,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();