commit fc3169b7370d32391e61e95dcf82757cc684e55b
author Sarah Chin <sarahchin@google.com> Wed Apr 28 20:21:03 2021 -0700
committer Sarah Chin <sarahchin@google.com> Thu Apr 29 12:25:33 2021 -0700
tree a1e4f4ce79e57eb8df359c2a348fefa0e9d2b6e4
parent afee24e554394c21448e6f838c45c0f37568ded0

Remove READ_PRIVILEGED_PHONE_STATE for checking carrier privilege

Same call as TM#hasCarrierPrivilege, which doesn't check for the
permission. Fix was either to add to permission for both or remove it
for both, but it doesn't seem necessary if it's just checking whether
the current app has permissions or not.

Test: atest TelephonyManagerTest
Bug: 171982472
Change-Id: I3663c028e3757cc78d820bc1568c1854127d3e34

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 63def4e..558ac05 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -6720,7 +6720,7 @@
 
     @Override
     public int checkCarrierPrivilegesForPackageAnyPhone(String pkgName) {
-        enforceReadPrivilegedPermission("checkCarrierPrivilegesForPackageAnyPhone");
+        // TODO(b/186774706): Remove @RequiresPermission from TelephonyManager API
         if (TextUtils.isEmpty(pkgName))
             return TelephonyManager.CARRIER_PRIVILEGE_STATUS_NO_ACCESS;
         int result = TelephonyManager.CARRIER_PRIVILEGE_STATUS_RULES_NOT_LOADED;