commit badc204c431fbe6be2a59be4a3435f3ca8a09dad
author Jonathan Basseri <misterikkit@google.com> Mon Apr 20 20:42:42 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 20 20:42:43 2015 +0000
tree dc3851d8ac9657d96f9013668fbad928929e6e93
parent aff21c99eb669ca3eb087f435561f0f31598fd61
parent 1fa437cd0b34550ab4befc4f5198761e61b3b0bd

Merge "Check for invalid simOperator."

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index c6ba22f..41d911c 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -2038,8 +2038,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 ;