commit e64de7820475d67ef0882a1b37f3bd188ca68e25
author Junda Liu <junda@google.com> Thu Apr 16 17:19:16 2015 -0700
committer Jonathan Basseri <misterikkit@google.com> Mon Apr 20 10:31:17 2015 -0700
tree a0c92763bab4613ca46c53bcbda4e778af83ba44
parent aa7161999a1ed51cd261a8c949d0f94ceb8f8237

Add multi-sim support for getCarrierPackageNamesForIntent.

resubmit of change Id100b7c4606287a1daa90092cd3c8a5a6519247d

Bug: 20268073
Change-Id: I8575681e17b1e1fdd308ad56b993ab348320f96c

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 59eb996..1a8de66 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -2025,8 +2025,12 @@
     }
 
     @Override
-    public List<String> getCarrierPackageNamesForIntent(Intent intent) {
-        UiccCard card = UiccController.getInstance().getUiccCard(mPhone.getPhoneId());
+    public List<String> getCarrierPackageNamesForIntentAndPhone(Intent intent, int phoneId) {
+        if (!SubscriptionManager.isValidPhoneId(phoneId)) {
+            loge("phoneId " + phoneId + " is not valid.");
+            return null;
+        }
+        UiccCard card = UiccController.getInstance().getUiccCard(phoneId);
         if (card == null) {
             loge("getCarrierPackageNamesForIntent: No UICC");
             return null ;