commit b6e41958f905f3c4f1daf08b98a04f673b430adf
author sqian <shuoq@google.com> Mon Mar 12 14:54:01 2018 -0700
committer sqian <shuoq@google.com> Wed Mar 14 19:39:37 2018 -0700
tree 5d663cfedceffd4b0e77e9d35e97c34fbbf09af8
parent 14d88800c9bb058317cfb2620a151f532bfbbad1

Check AppOps bit for TelephonyManager#getForbiddenPlmns

Bug: 73884967
Test: Telephony Sanity, Compile
Merged-In: Ifdce4187fb2d81a62d8e434c0fe924eb7a0ffe1c
(cherry picked from commit a2870fdb5c157ba103ffcbce4e4b23af8ff1570e)

Change-Id: Ib208b817873c3abcc8eb9ddd7ce085a7c9bd4e1c

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;