commit 181c74f651d870d5b1febd155fd1b527d4e4cd9e
author arunvoddu <arunvoddu@google.com> Mon Aug 19 14:21:29 2024 +0000
committer arunvoddu <arunvoddu@google.com> Wed Aug 21 04:33:46 2024 +0000
tree 53564adccd49a836babb85b2e9a149e9d741b32f
parent 659676d232c2d1326585b6721990585dcdab2801

Changed permission from READ_PHONE_STATE to READ_BASIC_PHONE_SATE for TM API.

TM#getCarrierRestrictionStatus permissions changes in order to avoid facing the
securityException in case the user disabled the READ_PHONE_STATE.

Flag: EXEMPT bugfix
Bug: 359910900
Test: CTS verified
Change-Id: If5bdd33bcb7f60f4bd92644cf1229decd0c3ed10

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 82e16fa..855ed74 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -9321,11 +9321,17 @@
      */
     @Override
     public void getCarrierRestrictionStatus(IIntegerConsumer callback, String packageName) {
-        enforceReadPermission("getCarrierRestrictionStatus");
-
+        String functionName = "getCarrierRestrictionStatus";
         enforceTelephonyFeatureWithException(packageName,
-                PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION, "getCarrierRestrictionStatus");
-
+                PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION, functionName);
+        try {
+            mApp.enforceCallingOrSelfPermission(
+                    android.Manifest.permission.READ_BASIC_PHONE_STATE,
+                    functionName);
+        } catch (SecurityException e) {
+            mApp.enforceCallingOrSelfPermission(permission.READ_PHONE_STATE,
+                    functionName);
+        }
         Set<Integer> carrierIds = validateCallerAndGetCarrierIds(packageName);
         if (carrierIds.contains(CarrierAllowListInfo.INVALID_CARRIER_ID)) {
             Rlog.e(LOG_TAG, "getCarrierRestrictionStatus: caller is not registered");