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

Commit f15c68e5 authored by Jordan Liu's avatar Jordan Liu Committed by android-build-merger
Browse files

Merge "Store EID in UiccSlot" 

am: 1ef1e146

Change-Id: Ib1b2fd6e28cfac9aae71529035b7244adab11255
parents 19cd1257 1ef1e146

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

+7 −0
Original line number Diff line number Diff line
@@ -63,6 +63,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;
@@ -147,6 +148,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
@@ -273,6 +275,10 @@ public class UiccSlot extends Handler { 
        }

    }



    public String getEid() {

        return mEid;

    }



    public boolean isExtendedApduSupported() {

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

    }
@@ -434,6 +440,7 @@ public class UiccSlot extends Handler { 
        pw.println(" mIsRemovable=" + mIsRemovable);

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

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

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

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

        if (mUiccCard != null) {

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