commit 53d4a3dc29d1a0f2cf384cb0bfc982c1ce622e0a
author Amit Mahajan <amitmahajan@google.com> Wed Jan 07 18:11:16 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 07 18:11:16 2015 +0000
tree bf899069dcbf96ec03d36b787aa775703b3b5593
parent 9443cdcbda67d657773398a262022a04f3e27841
parent a6fc2a8518c71b7a720f849bbfd4c51fe35a461d

Merge "Fix to use subId instead of slotId when calling getPhone()" into lmp-mr1-dev

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 1a5de74..24abf23 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -1574,14 +1574,19 @@
      */
     public boolean hasIccCard() {
         // FIXME Make changes to pass defaultSimId of type int
-        return hasIccCardUsingSlotId(getDefaultSubscription());
+        return hasIccCardUsingSlotId(mSubscriptionController.getSlotId(getDefaultSubscription()));
     }
 
     /**
      * @return true if a ICC card is present for a slotId
      */
     public boolean hasIccCardUsingSlotId(int slotId) {
-        return getPhone(slotId).getIccCard().hasIccCard();
+        int subId[] = mSubscriptionController.getSubIdUsingSlotId(slotId);
+        if (subId != null) {
+            return getPhone(subId[0]).getIccCard().hasIccCard();
+        } else {
+            return false;
+        }
     }
 
     /**