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

Commit 390da893 authored by Chen Xu's avatar Chen Xu
Browse files

Consider both ATR and num of ports reported to decide MEP support. 

1. Even ATR is suggesting eUICC supports MEP, framework or modem can still
disable MEP based on carrier restrictions. If MEP is disabled at lower
layer, it will report only one port to AP.
2. Given ATR parsing is done by AnswerToReset class which has the logging
and memeber variables, no need to keep a copy on UiccSlot just for
mATR.MEP

Bug: 213503081
Test: Manual
Change-Id: I63d74927ba5698d8fc26605e85d8cac606dddfb5
parent 3fc7ba2f

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

+11 −0
Original line number Diff line number Diff line
@@ -141,6 +141,17 @@ public class UiccCard { 
        mCardId = iccId;

    }





    /**

     * Updates MEP(Multiple Enabled Profile) support flag.

     *

     * <p>If IccSlotStatus comes later, the number of ports reported is only known after the

     * UiccCard creation which will impact UICC MEP capability.

     */

    public void updateSupportMultipleEnabledProfile(boolean supported) {

        mIsSupportsMultipleEnabledProfiles = supported;

    }



    @UnsupportedAppUsage

    public CardState getCardState() {

        synchronized (mLock) {

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

+15 −13
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ public class UiccSlot extends Handler { 
    private Context mContext;

    private UiccCard mUiccCard;

    private boolean mIsEuicc;

    private boolean mIsEuiccSupportsMultipleEnabledProfiles;

    private String mEid;

    private AnswerToReset mAtr;

    private boolean mIsRemovable;
@@ -138,7 +137,7 @@ public class UiccSlot extends Handler { 
                        loge("update: eid is missing. ics.eid=" + ics.eid);

                    }

                    mUiccCard = new EuiccCard(mContext, ci, ics, phoneId, mLock,

                            mIsEuiccSupportsMultipleEnabledProfiles);

                            isMultipleEnabledProfileSupported());

                }

            } else {

                if (mUiccCard != null) {
@@ -204,6 +203,11 @@ public class UiccSlot extends Handler { 
                mPortIdxToPhoneId.put(i, simPortInfos[i].mPortActive ?

                        simPortInfos[i].mLogicalSlotIndex : INVALID_PHONE_ID);

            }

            // Since the MEP capability is related with number ports reported, thus need to

            // update the flag after UiccCard creation.

            if (mUiccCard != null) {

                mUiccCard.updateSupportMultipleEnabledProfile(isMultipleEnabledProfileSupported());

            }

        }

    }
@@ -280,8 +284,10 @@ public class UiccSlot extends Handler { 


    /* Returns true if multiple enabled profiles are supported */

    public boolean isMultipleEnabledProfileSupported() {

        // True if num of port indexes are more than 1

        return mPortIdxToPhoneId.size() > 1;

        // even ATR suggest UICC supports multiple enabled profiles, MEP can be disabled per

        // carrier restrictions, so checking the real number of ports reported from modem is

        // necessary.

        return mPortIdxToPhoneId.size() > 1 && mAtr.isMultipleEnabledProfilesSupported();

    }



    private boolean absentStateUpdateNeeded(CardState oldState) {
@@ -344,22 +350,18 @@ public class UiccSlot extends Handler { 
        return true;

    }



    private void checkEuiccSupportedCapabilities() {

    private void checkIsEuiccSupported() {

        if (mAtr == null) {

            mIsEuicc = false;

            mIsEuiccSupportsMultipleEnabledProfiles = false;

            return;

        }

        mIsEuicc = mAtr.isEuiccSupported();

        mIsEuiccSupportsMultipleEnabledProfiles = mAtr.isMultipleEnabledProfilesSupported();

        log(" checkEuiccSupportedCapabilities : isEuicc-> " + mIsEuicc

                + " isMultipleEnabledProfilesSupported-> "

                + mIsEuiccSupportsMultipleEnabledProfiles);

        log(" checkIsEuiccSupported : " + mIsEuicc);

    }



    private void parseAtr(String atr) {

        mAtr = AnswerToReset.parseAtr(atr);

        checkEuiccSupportedCapabilities();

        checkIsEuiccSupported();

    }



    public boolean isEuicc() {
@@ -545,8 +547,8 @@ public class UiccSlot extends Handler { 
        pw.println("UiccSlot:");

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

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

        pw.println(" mIsEuiccSupportsMultipleEnabledProfiles="

                + mIsEuiccSupportsMultipleEnabledProfiles);

        pw.println(" isEuiccSupportsMultipleEnabledProfiles="

                + isMultipleEnabledProfileSupported());

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

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

        pw.println(" mIccIds=" + mIccIds.values());