commit 29ddca48a4e4b3c029e76a08c0cca61c5322761e
author sqian <shuoq@google.com> Fri Apr 13 17:07:29 2018 -0700
committer android-build-team Robot <android-build-team-robot@google.com> Mon Jun 04 23:31:41 2018 +0000
tree 3a33ed7e66b5648dddbe50de0809d0d847b40345
parent e9e5cb8c47e8ea304bf2c3402493f03ffd8bd826

Fix broken permission check for TelephonyManager#getForbiddenPlmns

(this is backport fix merged from pi-dev)

Bug: 73884967
Test: Treehugger
Change-Id: Ic2f0a83dc67dba0f5414d3660887bf3ab611d44d
Merged-In: Ifdce4187fb2d81a62d8e434c0fe924eb7a0ffe1c
Merged-In: Ib208b817873c3abcc8eb9ddd7ce085a7c9bd4e1c
(cherry picked from commit be104a3158a9dbead6eb9cff31c75350cd486dbc)

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 616acda..20ede2f 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -2468,9 +2468,10 @@
      * Get the forbidden PLMN List from the given app type (ex APPTYPE_USIM)
      * on a particular subscription
      */
-    public String[] getForbiddenPlmns(int subId, int appType) {
-        mApp.enforceCallingOrSelfPermission(android.Manifest.permission.READ_PHONE_STATE,
-                "Requires READ_PHONE_STATE");
+    public String[] getForbiddenPlmns(int subId, int appType, String callingPackage) {
+        if (!canReadPhoneState(callingPackage, "getForbiddenPlmns")) {
+            return null;
+        }
         if (appType != TelephonyManager.APPTYPE_USIM && appType != TelephonyManager.APPTYPE_SIM) {
             loge("getForbiddenPlmnList(): App Type must be USIM or SIM");
             return null;