commit 5b0d75adc4304814773d9a031efad6d23ab37578
author Jayachandran C <jayachandranc@google.com> Thu Oct 21 22:15:27 2021 -0700
committer Jayachandran Chinnakkannu <jayachandranc@google.com> Fri Oct 22 07:03:20 2021 +0000
tree 307a8d9732ccfb3ea21bf04853a428837b30acfb
parent a7d560a62336dbec73a12c632080badc1a60a61b

Enforce MODIFY_PHONE_STATE or CarrierPrivilege permission for TelephonyManager#setForbiddenPlmns() API

The API documentation and actual implementation mismatches. This CL
fixes the actual implementation as per API expectation.

Bug: 202760015
Test: telephony tests
Change-Id: Ie1d08e65049a6198c10db5d267a001acbdabc145

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index fcb1764..bbd263d 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -5512,11 +5512,9 @@
      */
     public int setForbiddenPlmns(int subId, int appType, List<String> fplmns, String callingPackage,
             String callingFeatureId) {
-        if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(mApp, subId, callingPackage,
-                callingFeatureId, "setForbiddenPlmns")) {
-            if (DBG) logv("no permissions for setForbiddenplmns");
-            throw new IllegalStateException("No Permissions for setForbiddenPlmns");
-        }
+        TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(
+                mApp, subId, "setForbiddenPlmns");
+
         if (appType != TelephonyManager.APPTYPE_USIM && appType != TelephonyManager.APPTYPE_SIM) {
             loge("setForbiddenPlmnList(): App Type must be USIM or SIM");
             throw new IllegalArgumentException("Invalid appType: App Type must be USIM or SIM");