Revert "Move carrier privilege intent resolution to CarrierPrivi..."
Revert "Move carrier privilege intent resolution to CarrierPrivi..."
Revert submission 16624154-carrier-privs-intent
Reason for revert: Breaking VcnManagerTest and ConnectivityDiagnosticsManagerTest
BUG:217412107
BUG:217412690
Reverted Changes:
Idc7c2c434:Move carrier privilege intent resolution to Carrie...
Icdf82d070:Move carrier privilege intent resolution to Carrie...
Change-Id: Ib9587ed75d7e868aa17d475b21a30f68e8a5756f
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index f0f7731..4182af1 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -6902,15 +6902,16 @@
@Override
public List<String> getCarrierPackageNamesForIntentAndPhone(Intent intent, int phoneId) {
enforceReadPrivilegedPermission("getCarrierPackageNamesForIntentAndPhone");
- Phone phone = PhoneFactory.getPhone(phoneId);
- if (phone == null) {
- return Collections.emptyList();
+ if (!SubscriptionManager.isValidPhoneId(phoneId)) {
+ loge("phoneId " + phoneId + " is not valid.");
+ return null;
}
- CarrierPrivilegesTracker cpt = phone.getCarrierPrivilegesTracker();
- if (cpt == null) {
- return Collections.emptyList();
+ UiccPort port = UiccController.getInstance().getUiccPort(phoneId);
+ if (port == null) {
+ loge("getCarrierPackageNamesForIntentAndPhone: No UICC");
+ return null ;
}
- return cpt.getCarrierPackageNamesForIntent(intent);
+ return port.getCarrierPackageNamesForIntent(mApp.getPackageManager(), intent);
}
@Override