commit af476cbd48900214e4477cff4ac153e64ce218f9
author Jiuyu Sun <jiuyu@google.com> Mon Apr 16 17:36:54 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 16 17:36:54 2018 +0000
tree 4e5bfe039b62ee129a62d211b89172306b1e2005
parent 524a95a441f944f1ed6af01c87bd75e8bdedb6ac
parent 1d957c585e7b1d0a18b82e724ff446dda4fb11be

Merge "Fix the issue on reading cardId." into pi-dev

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index d0f50c7..1537471 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -4135,12 +4135,20 @@
         enforceReadPrivilegedPermission();
 
         UiccSlot[] slots = UiccController.getInstance().getUiccSlots();
-        if (slots == null) return null;
+        if (slots == null) {
+            Rlog.i(LOG_TAG, "slots is null.");
+            return null;
+        }
+
         UiccSlotInfo[] infos = new UiccSlotInfo[slots.length];
         for (int i = 0; i < slots.length; i++) {
             UiccSlot slot = slots[i];
 
-            String cardId = UiccController.getInstance().getUiccCard(i).getCardId();
+            String cardId = null;
+            UiccCard card = slot.getUiccCard();
+            if (card != null) {
+                cardId = card.getCardId();
+            }
 
             int cardState = 0;
             switch (slot.getCardState()) {