Fix the issue on reading cardId.
We should get the card from the slot first. Check whether the card is
null. If not null, get the cardId. If the card is null, just set the
cardId as null.
The index for getUiccCard() should be phoneId, which is inconsistent
with the previously given physical slot id. It's possible that
UiccController#getUiccCard() returns a null card and thus cause NPE.
Bug: 77607791
Test: test on phone
Change-Id: I6e145612398e798be0b370ccb59004c5df25f8c4
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 5cbb6f6..8cf7ed6 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -4088,12 +4088,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()) {