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

Commit 74b98304 authored by Jordan Liu's avatar Jordan Liu
Browse files

Store EID in UiccSlot 

This EID tracks the slot status EID, which is unpopulated for old
versions of the HAL and non-eUICCs.

Bug: 140454770
Test: manually verify that getUiccSlotsInfo returns EID of inactive
eUICC
Change-Id: Ifa5c75c73cf868561a537affb97026fafcce895a
parent 319c12bb

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

+7 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ public class UiccSlot extends Handler { 
    private int mLastRadioState = TelephonyManager.RADIO_POWER_UNAVAILABLE;

    private boolean mIsEuicc;

    private String mIccId;

    private String mEid;

    private AnswerToReset mAtr;

    private int mPhoneId = INVALID_PHONE_ID;

    private boolean mIsRemovable;
@@ -145,6 +146,7 @@ public class UiccSlot extends Handler { 
            parseAtr(iss.atr);

            mCardState = iss.cardState;

            mIccId = iss.iccid;

            mEid = iss.eid;

            mIsRemovable = isSlotRemovable(slotIndex);

            if (iss.slotState == IccSlotStatus.SlotState.SLOTSTATE_INACTIVE) {

                // TODO: (b/79432584) evaluate whether should broadcast card state change
@@ -271,6 +273,10 @@ public class UiccSlot extends Handler { 
        }

    }



    public String getEid() {

        return mEid;

    }



    public boolean isExtendedApduSupported() {

        return  (mAtr != null && mAtr.isExtendedApduSupported());

    }
@@ -424,6 +430,7 @@ public class UiccSlot extends Handler { 
        pw.println(" mIsEuicc=" + mIsEuicc);

        pw.println(" mLastRadioState=" + mLastRadioState);

        pw.println(" mIccId=" + mIccId);

        pw.println(" mEid=" + mEid);

        pw.println(" mCardState=" + mCardState);

        if (mUiccCard != null) {

            pw.println(" mUiccCard=" + mUiccCard);