commit 2e20da3623ac258870f5976631fc5a61a319ad3f
author Rambo Wang <rambowang@google.com> Wed Mar 23 02:10:01 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 23 02:10:01 2022 +0000
tree dcf2169343d299942778ac01dc1f396695c6e0b3
parent 019b5ad0c107ef8dc8b8960c8f0c44b423ba8325
parent b0eb479465a02b264e7a7339917b50833df9a32d

Merge "Move carrier privilege intent resolution to CarrierPrivilegesTracker."

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 0f54d11..d884864 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -6830,16 +6830,15 @@
     @Override
     public List<String> getCarrierPackageNamesForIntentAndPhone(Intent intent, int phoneId) {
         enforceReadPrivilegedPermission("getCarrierPackageNamesForIntentAndPhone");
-        if (!SubscriptionManager.isValidPhoneId(phoneId)) {
-            loge("phoneId " + phoneId + " is not valid.");
-            return null;
+        Phone phone = PhoneFactory.getPhone(phoneId);
+        if (phone == null) {
+            return Collections.emptyList();
         }
-        UiccPort port = UiccController.getInstance().getUiccPort(phoneId);
-        if (port == null) {
-            loge("getCarrierPackageNamesForIntentAndPhone: No UICC");
-            return null ;
+        CarrierPrivilegesTracker cpt = phone.getCarrierPrivilegesTracker();
+        if (cpt == null) {
+            return Collections.emptyList();
         }
-        return port.getCarrierPackageNamesForIntent(mApp.getPackageManager(), intent);
+        return cpt.getCarrierPackageNamesForIntent(intent);
     }
 
     @Override