commit ee78341221586feb54d56c98ca04f24f6548b361
author Jeff Sharkey <jsharkey@google.com> Sun Apr 19 05:00:27 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sun Apr 19 05:00:32 2015 +0000
tree 58b271a8c139b49632cb36790a5a594cebe0f5eb
parent d1d9fb4a677747b01a8249b8a21a1bf7ed772e74
parent 3727f9330f026e800c99c5cee172930180292657

Merge "Revert "Add multi-sim support for getCarrierPackageNamesForIntent.""

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index c9eeb95..c040410 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -2032,12 +2032,8 @@
     }
 
     @Override
-    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);
+    public List<String> getCarrierPackageNamesForIntent(Intent intent) {
+        UiccCard card = UiccController.getInstance().getUiccCard(mPhone.getPhoneId());
         if (card == null) {
             loge("getCarrierPackageNamesForIntent: No UICC");
             return null ;