Fix the null cardId issue when card is null.
When card is null, we can get the iccid from UiccSlot instead of just
using null. This fix the issue that when it's on eSIM slot and inserting
a SIM card, a null iccid is returned.
Bug: 78249974
Test: test on phone
Change-Id: I84706be7590cfa7b0dcb4b6055b364078257a8c2
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 27c725d..489c3bd 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -4199,10 +4199,12 @@
for (int i = 0; i < slots.length; i++) {
UiccSlot slot = slots[i];
- String cardId = null;
+ String cardId;
UiccCard card = slot.getUiccCard();
if (card != null) {
cardId = card.getCardId();
+ } else {
+ cardId = slot.getIccId();
}
int cardState = 0;