Revert "Revert "Move carrier privilege intent resolution to Carr..."
Revert "Revert "Move carrier privilege intent resolution to Carr..."
Revert submission 16766159-revert-16624154-carrier-privs-intent-YNFCKNRVHL
Reason for revert: Restore original CLs after fix the break
Reverted Changes:
Ib9587ed75:Revert "Move carrier privilege intent resolution t...
Iedd36d302:Revert "Move carrier privilege intent resolution t...
Change-Id: I717760a0b5be335bffd739c0ea6a730e7a03bb1f
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 4182af1..f0f7731 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -6902,16 +6902,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