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

Commit fd083b5e authored by Jordan Liu's avatar Jordan Liu
Browse files

Do not overwrite default eUICC when not needed 

If mDefaultCardId >= 0 (corresponds to an actual eUICC), do not reset it
to UNINITIALIZED unless the old default eUICC is no longer inserted.

Bug: 153019179
Test: atest UiccController
Change-Id: I209514f0aa54f391641b0a1512d4c70578f9c7ac
parent 65dfd4cf

src/java/com/android/internal/telephony/uicc/UiccController.java

+25 −5
Original line number Diff line number Diff line
@@ -1000,7 +1000,7 @@ public class UiccController extends Handler { 
                    if (!TextUtils.isEmpty(eid)) {

                        isDefaultEuiccCardIdSet = true;

                        mDefaultEuiccCardId = convertToPublicCardId(eid);

                        log("Using eid=" + eid + " from removable eUICC in slot="

                        logWithLocalLog("Using eid=" + eid + " from removable eUICC in slot="

                                + i + " to set mDefaultEuiccCardId=" + mDefaultEuiccCardId);

                        break;

                    }
@@ -1009,17 +1009,37 @@ public class UiccController extends Handler { 
        }



        if (mHasBuiltInEuicc && !anyEuiccIsActive && !isDefaultEuiccCardIdSet) {

            log("onGetSlotStatusDone: setting TEMPORARILY_UNSUPPORTED_CARD_ID");

            logWithLocalLog(

                    "onGetSlotStatusDone: mDefaultEuiccCardId=TEMPORARILY_UNSUPPORTED_CARD_ID");

            isDefaultEuiccCardIdSet = true;

            mDefaultEuiccCardId = TEMPORARILY_UNSUPPORTED_CARD_ID;

        }





        if (!isDefaultEuiccCardIdSet) {

            if (mDefaultEuiccCardId >= 0) {

                // if mDefaultEuiccCardId has already been set to an actual eUICC,

                // don't overwrite mDefaultEuiccCardId unless that eUICC is no longer inserted

                boolean defaultEuiccCardIdIsStillInserted = false;

                String cardString = mCardStrings.get(mDefaultEuiccCardId);

                for (UiccSlot slot : mUiccSlots) {

                    if (cardString.equals(IccUtils.stripTrailingFs(slot.getEid()))) {

                        defaultEuiccCardIdIsStillInserted = true;

                    }

                }

                if (!defaultEuiccCardIdIsStillInserted) {

                    logWithLocalLog("onGetSlotStatusDone: mDefaultEuiccCardId="

                            + mDefaultEuiccCardId

                            + " is no longer inserted. Setting mDefaultEuiccCardId=UNINITIALIZED");

                    mDefaultEuiccCardId = UNINITIALIZED_CARD_ID;

                }

            } else {

                // no known eUICCs at all (it's possible that an eUICC is inserted and we just don't

                // know it's EID)

                logWithLocalLog("onGetSlotStatusDone: mDefaultEuiccCardId=UNINITIALIZED");

                mDefaultEuiccCardId = UNINITIALIZED_CARD_ID;

            }

        }



        if (VDBG) logPhoneIdToSlotIdMapping();