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

Commit bba3be6a authored by Holly Jiuyu Sun's avatar Holly Jiuyu Sun Committed by android-build-merger
Browse files

Merge "Only allow LPA to select ISD-R using iccTransmitApduBasicChannel" am:... 

Merge "Only allow LPA to select ISD-R using iccTransmitApduBasicChannel" am: 04e5e633 am: 8b37eedf
am: 7c824e97

Change-Id: I33e427e9f34c90a742dd9c6e7cc2baf0bfad4825
parents 06311b73 7c824e97

telephony/java/android/telephony/TelephonyManager.java

+1 −1
Original line number Diff line number Diff line
@@ -4463,7 +4463,7 @@ public class TelephonyManager { 
        try {

            ITelephony telephony = getITelephony();

            if (telephony != null)

                return telephony.iccTransmitApduBasicChannel(subId, cla,

                return telephony.iccTransmitApduBasicChannel(subId, getOpPackageName(), cla,

                    instruction, p1, p2, p3, data);

        } catch (RemoteException ex) {

        } catch (NullPointerException ex) {

telephony/java/com/android/internal/telephony/ITelephony.aidl

+2 −1
Original line number Diff line number Diff line
@@ -681,6 +681,7 @@ interface ITelephony { 
     * Input parameters equivalent to TS 27.007 AT+CSIM command.

     *

     * @param subId The subscription to use.

     * @param callingPackage the name of the package making the call.

     * @param cla Class of the APDU command.

     * @param instruction Instruction of the APDU command.

     * @param p1 P1 value of the APDU command.
@@ -691,7 +692,7 @@ interface ITelephony { 
     * @return The APDU response from the ICC card with the status appended at

     *            the end.

     */

    String iccTransmitApduBasicChannel(int subId, int cla, int instruction,

    String iccTransmitApduBasicChannel(int subId, String callingPackage, int cla, int instruction,

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



    /**