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

Commit f18e5110 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove overloaded iccCloseLogicalChannel and... 

Merge "Remove overloaded iccCloseLogicalChannel and iccTransmitApduLogicalChannel from CommandInterface" into udc-dev am: 0eb34adc

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/21483244



Change-Id: Ifaf6b6a367020b6c3d6d61fbd718c12aab22c458
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f2ea78a3 0eb34adc

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

+0 −33
Original line number Diff line number Diff line
@@ -2110,19 +2110,6 @@ public interface CommandsInterface { 
     */

    public void iccOpenLogicalChannel(String AID, int p2, Message response);



    /**

     * Close a previously opened logical channel to the SIM.

     *

     * Input parameters equivalent to TS 27.007 AT+CCHC command.

     *

     * Starting with Android U, use {@link #iccCloseLogicalChannel(int, boolean, Message)}}

     * API to close the logical channel if the channel was opened to perform ES10 operations.

     *

     * @param channel Channel id. Id of the channel to be closed.

     * @param response Callback message.

     */

    public void iccCloseLogicalChannel(int channel, Message response);



    /**

     * Close a previously opened logical channel to the SIM.

     *
@@ -2138,26 +2125,6 @@ public interface CommandsInterface { 
     */

    public void iccCloseLogicalChannel(int channel, boolean isEs10, Message response);



    /**

     * Exchange APDUs with the SIM on a logical channel.

     *

     * Input parameters equivalent to TS 27.007 AT+CGLA command.

     *

     * @param channel Channel id of the channel to use for communication. Has to

     *            be greater than zero.

     * @param cla Class of the APDU command.

     * @param instruction Instruction of the APDU command.

     * @param p1 P1 value of the APDU command.

     * @param p2 P2 value of the APDU command.

     * @param p3 P3 value of the APDU command. If p3 is negative a 4 byte APDU

     *            is sent to the SIM.

     * @param data Data to be sent with the APDU.

     * @param response Callback message. response.obj.userObj will be

     *            an IccIoResult on success.

     */

    public void iccTransmitApduLogicalChannel(int channel, int cla, int instruction,

            int p1, int p2, int p3, String data, Message response);



    /**

     * Exchange APDUs with the SIM on a logical channel.

     *

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

+0 −11
Original line number Diff line number Diff line
@@ -4120,11 +4120,6 @@ public class RIL extends BaseCommands implements CommandsInterface { 
        }

    }



    @Override

    public void iccCloseLogicalChannel(int channel, Message result) {

        iccCloseLogicalChannel(channel, false, result);

    }



    @Override

    public void iccCloseLogicalChannel(int channel, boolean isEs10, Message result) {

        RadioSimProxy simProxy = getRadioServiceProxy(RadioSimProxy.class, result);
@@ -4144,12 +4139,6 @@ public class RIL extends BaseCommands implements CommandsInterface { 
        }

    }



    @Override

    public void iccTransmitApduLogicalChannel(int channel, int cla, int instruction, int p1, int p2,

            int p3, String data, Message result) {

        iccTransmitApduLogicalChannel(channel, cla, instruction, p1, p2, p3, data, false, result);

    }



    @Override

    public void iccTransmitApduLogicalChannel(int channel, int cla, int instruction, int p1, int p2,

            int p3, String data, boolean isEs10Command, Message result) {

src/java/com/android/internal/telephony/imsphone/ImsPhoneCommandInterface.java

+0 −8
Original line number Diff line number Diff line
@@ -606,17 +606,9 @@ class ImsPhoneCommandInterface extends BaseCommands implements CommandsInterface 
    @Override

    public void iccOpenLogicalChannel(String AID, int p2, Message response) {}



    @Override

    public void iccCloseLogicalChannel(int channel, Message response) {}



    @Override

    public void iccCloseLogicalChannel(int channel, boolean isEs10, Message response) {}



    @Override

    public void iccTransmitApduLogicalChannel(int channel, int cla, int instruction,

                                              int p1, int p2, int p3, String data,

                                              Message response) {}



    @Override

    public void iccTransmitApduLogicalChannel(int channel, int cla, int instruction,

                                              int p1, int p2, int p3, String data,

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

+4 −4
Original line number Diff line number Diff line
@@ -426,8 +426,8 @@ public class UiccCarrierPrivilegeRules extends Handler { 
                if (ar.exception == null && ar.result != null) {

                    mChannelId = ((int[]) ar.result)[0];

                    mUiccProfile.iccTransmitApduLogicalChannel(mChannelId, CLA, COMMAND, P1, P2, P3,

                            DATA, obtainMessage(EVENT_TRANSMIT_LOGICAL_CHANNEL_DONE, mChannelId,

                                    mAIDInUse));

                            DATA, false /*isEs10Command*/, obtainMessage(

                                    EVENT_TRANSMIT_LOGICAL_CHANNEL_DONE, mChannelId, mAIDInUse));

                } else {

                    if (shouldRetry(ar, mRetryCount)) {

                        log("should retry");
@@ -483,7 +483,7 @@ public class UiccCarrierPrivilegeRules extends Handler { 
                                }

                            } else {

                                mUiccProfile.iccTransmitApduLogicalChannel(mChannelId, CLA, COMMAND,

                                        P1, P2_EXTENDED_DATA, P3, DATA,

                                        P1, P2_EXTENDED_DATA, P3, DATA, false /*isEs10Command*/,

                                        obtainMessage(EVENT_TRANSMIT_LOGICAL_CHANNEL_DONE,

                                                mChannelId, mAIDInUse));

                                break;
@@ -518,7 +518,7 @@ public class UiccCarrierPrivilegeRules extends Handler { 
                    }

                }



                mUiccProfile.iccCloseLogicalChannel(mChannelId, obtainMessage(

                mUiccProfile.iccCloseLogicalChannel(mChannelId, false /*isEs10*/, obtainMessage(

                        EVENT_CLOSE_LOGICAL_CHANNEL_DONE, 0, mAIDInUse));

                mChannelId = -1;

                break;

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

+4 −4
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ public class UiccPkcs15 extends Handler { 
        private void selectFile() {

            if (mChannelId >= 0) {

                mUiccProfile.iccTransmitApduLogicalChannel(mChannelId, 0x00, 0xA4, 0x00, 0x04, 0x02,

                        mFileId, obtainMessage(EVENT_SELECT_FILE_DONE));

                        mFileId, false /*isEs10Command*/, obtainMessage(EVENT_SELECT_FILE_DONE));

            } else {

                log("EF based");

            }
@@ -90,7 +90,7 @@ public class UiccPkcs15 extends Handler { 
        private void readBinary() {

            if (mChannelId >=0 ) {

                mUiccProfile.iccTransmitApduLogicalChannel(mChannelId, 0x00, 0xB0, 0x00, 0x00, 0x00,

                        "", obtainMessage(EVENT_READ_BINARY_DONE));

                        "",  false /*isEs10Command*/, obtainMessage(EVENT_READ_BINARY_DONE));

            } else {

                log("EF based");

            }
@@ -281,8 +281,8 @@ public class UiccPkcs15 extends Handler { 
    private void cleanUp() {

        log("cleanUp");

        if (mChannelId >= 0) {

            mUiccProfile.iccCloseLogicalChannel(mChannelId, obtainMessage(

                    EVENT_CLOSE_LOGICAL_CHANNEL_DONE));

            mUiccProfile.iccCloseLogicalChannel(mChannelId, false /*isEs10*/,

                    obtainMessage(EVENT_CLOSE_LOGICAL_CHANNEL_DONE));

            mChannelId = -1;

        }

        mLoadedCallback.sendToTarget();