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

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

Add EID to IccCardStatus 

Test: make
Bug: 116656814
Change-Id: I05ab6e27733e756d0a8315b98f5d9c35b8f9fb7b
parent 5e7f4f89

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

+27 −0
Original line number Diff line number Diff line
@@ -111,6 +111,15 @@ public class RadioResponse extends IRadioResponse.Stub { 
        responseIccCardStatus_1_2(responseInfo, cardStatus);

    }



    /**

     * @param responseInfo Response info struct containing response type, serial no. and error

     * @param cardStatus ICC card status as defined by CardStatus in 1.3/types.hal

     */

    public void getIccCardStatusResponse_1_3(RadioResponseInfo responseInfo,

                                             android.hardware.radio.V1_3.CardStatus cardStatus) {

        responseIccCardStatus_1_3(responseInfo, cardStatus);

    }



    /**

     * @param responseInfo Response info struct containing response type, serial no. and error

     * @param remainingAttempts Number of retries remaining, must be equal to -1 if unknown.
@@ -1441,6 +1450,24 @@ public class RadioResponse extends IRadioResponse.Stub { 
        }

    }



    private void responseIccCardStatus_1_3(RadioResponseInfo responseInfo,

                                           android.hardware.radio.V1_3.CardStatus cardStatus) {

        RILRequest rr = mRil.processResponse(responseInfo);



        if (rr != null) {

            IccCardStatus iccCardStatus = convertHalCardStatus(cardStatus.base.base);

            iccCardStatus.physicalSlotIndex = cardStatus.base.physicalSlotId;

            iccCardStatus.atr = cardStatus.base.atr;

            iccCardStatus.iccid = cardStatus.base.iccid;

            iccCardStatus.eid = cardStatus.eid;

            mRil.riljLog("responseIccCardStatus: from HIDL: " + iccCardStatus);

            if (responseInfo.error == RadioError.NONE) {

                sendMessageResponse(rr.mResult, iccCardStatus);

            }

            mRil.processResponseDone(rr, responseInfo, iccCardStatus);

        }

    }



    private void responseInts(RadioResponseInfo responseInfo, int ...var) {

        final ArrayList<Integer> ints = new ArrayList<>();

        for (int i = 0; i < var.length; i++) {

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

+2 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ public class IccCardStatus { 
    public int        physicalSlotIndex = UiccController.INVALID_SLOT_ID;

    public String     atr;

    public String     iccid;

    public String     eid;



    public IccCardApplicationStatus[] mApplications;
@@ -149,6 +150,7 @@ public class IccCardStatus { 


        sb.append(",physical_slot_id=").append(physicalSlotIndex).append(",atr=").append(atr);

        sb.append(",iccid=").append(SubscriptionInfo.givePrintableIccid(iccid));

        sb.append(",eid=").append(eid);



        sb.append("}");

        return sb.toString();