commit 0a45f5486503fc91def46140bbda1cbbc82219b9
author Chen Xu <fionaxu@google.com> Thu Mar 15 18:01:02 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 15 18:01:02 2018 +0000
tree 2421ec2ba48b34511d388ff4638989665b4f5c01
parent b6e41958f905f3c4f1daf08b98a04f673b430adf
parent 17b3a6f5ccc256d8ddfa060110e313cf29d098bd

Merge "support expanding advanced settings from intent extra" into pi-dev

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 16996c0..df21799 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -2520,10 +2520,11 @@
      * Get the forbidden PLMN List from the given app type (ex APPTYPE_USIM)
      * on a particular subscription
      */
-    public String[] getForbiddenPlmns(int subId, int appType) {
-        // TODO(b/73884967): Migrate to TelephonyPermissions check.
-        mApp.enforceCallingOrSelfPermission(android.Manifest.permission.READ_PHONE_STATE,
-                "Requires READ_PHONE_STATE");
+    public String[] getForbiddenPlmns(int subId, int appType, String callingPackage) {
+        if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
+                mApp, subId, callingPackage, "getForbiddenPlmns")) {
+            return null;
+        }
         if (appType != TelephonyManager.APPTYPE_USIM && appType != TelephonyManager.APPTYPE_SIM) {
             loge("getForbiddenPlmnList(): App Type must be USIM or SIM");
             return null;