Allow privileged apps to call getUiccCardsInfo
If caller has READ_PRIVILGED_PHONE_STATE, no need for carrier
privileges. One case where this is required is when
SubscriptionInfoUpdater tries to get the list of embedded subscriptions
through the EuiccController. Another use case is the LPA.
Fixes: 124335347
Test: manual
Change-Id: I86447b33162fb0cb3c66439ba664df2d8114e33d
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index e887ecc..926e770 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -5989,9 +5989,15 @@
@Override
public List<UiccCardInfo> getUiccCardsInfo(String callingPackage) {
- if (checkCarrierPrivilegesForPackageAnyPhone(callingPackage)
- != TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS) {
- throw new SecurityException("Caller does not have carrier privileges on any UICC.");
+ try {
+ enforceReadPrivilegedPermission("getUiccCardsInfo");
+ } catch (SecurityException e) {
+ // even without READ_PRIVILEGED_PHONE_STATE, we allow the call to continue if the caller
+ // has carrier privileges on an active UICC
+ if (checkCarrierPrivilegesForPackageAnyPhone(callingPackage)
+ != TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS) {
+ throw new SecurityException("Caller does not have carrier privileges on any UICC");
+ }
}
final long identity = Binder.clearCallingIdentity();