commit 8c92f3842a2a8045ecff6e8a75b0652a4ee875ae
author Nathan Harold <nharold@google.com> Thu Apr 13 18:19:05 2017 -0700
committer Nathan Harold <nharold@google.com> Mon Apr 17 17:30:55 2017 +0000
tree e3e0bcf47d2809d2489a8890f8ba0504cdf04666
parent c5179f67a10bd428fc016abf0f8664570d1b9556

Fix Permissions Reference for getForbiddenPlmns()

Previously this was incorrectly using an internal-only permission
for a public API. Need to use the external version.

Bug: 35261110
Test: TelephonyManagerTest.testGetForbiddenPlmns
Merged-In: Ia4bb90a4cad92f61781128a0a381e2ad087b07e1
Change-Id: Ia4bb90a4cad92f61781128a0a381e2ad087b07e1
(cherry picked from commit 892104e2929f221f87f8e30c446f381a9ea2f0b8)

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 52c2a79..414267a 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -2485,8 +2485,8 @@
      * on a particular subscription
      */
     public String[] getForbiddenPlmns(int subId, int appType) {
-        mApp.enforceCallingOrSelfPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,
-                "Requires READ_PRIVILEGED_PHONE_STATE");
+        mApp.enforceCallingOrSelfPermission(android.Manifest.permission.READ_PHONE_STATE,
+                "Requires READ_PHONE_STATE");
         if (appType != TelephonyManager.APPTYPE_USIM && appType != TelephonyManager.APPTYPE_SIM) {
             loge("getForbiddenPlmnList(): App Type must be USIM or SIM");
             return null;