commit 4ac4f987c4c52d61167f0e7c0b970fff99eff1a7
author Alireza Forouzan <alirezaf@google.com> Tue Mar 16 22:18:52 2021 -0700
committer Alireza Forouzan <alirezaf@google.com> Sun Mar 21 17:49:14 2021 +0000
tree ab3b7889ede77c72f324f63663f2ce8b80eae65e
parent d0a2b02567f769ce6b0d8247b94ef02180c85f64

Check CarrierPriviledge for getPhoneAccountHandleForSubscriptionId

Currently getPhoneAccountHandleForSubscriptionId requires
READ_PRIVILEGED_PHONE_STATE permission. This change allows carrier
priviledged app to get the phone account handle of its own
subcriptionId.

Bug: 182966851
Test: manual
Change-Id: If23542fb003eb8af6299ffe6945c331b09ee9d9e

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 798d429..4905316 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -7351,8 +7351,11 @@
 
     @Override
     public @Nullable PhoneAccountHandle getPhoneAccountHandleForSubscriptionId(int subscriptionId) {
-        enforceReadPrivilegedPermission("getPhoneAccountHandleForSubscriptionId, "
-                + "subscriptionId: " + subscriptionId);
+        TelephonyPermissions
+                .enforeceCallingOrSelfReadPrivilegedPhoneStatePermissionOrCarrierPrivilege(
+                mApp,
+                subscriptionId,
+                "getPhoneAccountHandleForSubscriptionId, " + "subscriptionId: " + subscriptionId);
         final long identity = Binder.clearCallingIdentity();
         try {
             Phone phone = getPhone(subscriptionId);