Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57958d47 authored by Chen Xu's avatar Chen Xu Committed by Automerger Merge Worker
Browse files

Merge "fix the logic of isAllIccIdQueryDone" into tm-dev am: 52b9e10f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/17214774

Change-Id: I7e2b09c72f57f4e891c4bcdbefb4b8ad099aa224
parents 39e47447 52b9e10f

src/java/com/android/internal/telephony/SubscriptionInfoUpdater.java

+4 −1
Original line number Diff line number Diff line
@@ -249,7 +249,10 @@ public class SubscriptionInfoUpdater extends Handler { 
        for (int i = 0; i < TelephonyManager.getDefault().getActiveModemCount(); i++) {

            UiccSlot slot = UiccController.getInstance().getUiccSlotForPhone(i);

            int slotId = UiccController.getInstance().getSlotIdFromPhoneId(i);

            if  (sIccId[i] == null || UiccController.getInstance().getUiccPort(i) == null) {

            // When psim card is absent there is no port object even the port state is active.

            // We should check the slot state for psim and port state for esim(MEP eUICC).

            if  (sIccId[i] == null || slot == null || !slot.isActive()

                    || (slot.isEuicc() && UiccController.getInstance().getUiccPort(i) == null)) {

                if (sIccId[i] == null) {

                    logd("Wait for SIM " + i + " Iccid");

                } else {