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

Commit d3541e5b authored by Shishir Agrawal's avatar Shishir Agrawal Committed by Android (Google) Code Review
Browse files

Merge "Return APDU status code on tramsit channel command failure." into lmp-dev

parents cdcd487a 43d94347

telephony/java/android/telephony/TelephonyManager.java

+2 −2
Original line number Diff line number Diff line
@@ -2401,7 +2401,7 @@ public class TelephonyManager { 
     *            is sent to the SIM.

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

     * @return The APDU response from the ICC card with the status appended at

     *            the end. If an error occurs, an empty string is returned.

     *            the end.

     */

    public String iccTransmitApduLogicalChannel(int channel, int cla,

            int instruction, int p1, int p2, int p3, String data) {
@@ -2431,7 +2431,7 @@ public class TelephonyManager { 
     *            is sent to the SIM.

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

     * @return The APDU response from the ICC card with the status appended at

     *            the end. If an error occurs, an empty string is returned.

     *            the end.

     */

    public String iccTransmitApduBasicChannel(int cla,

            int instruction, int p1, int p2, int p3, String data) {

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

+2 −2
Original line number Diff line number Diff line
@@ -530,7 +530,7 @@ interface ITelephony { 
     *            is sent to the SIM.

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

     * @return The APDU response from the ICC card with the status appended at

     *            the end. If an error occurs, an empty string is returned.

     *            the end.

     */

    String iccTransmitApduLogicalChannel(int channel, int cla, int instruction,

            int p1, int p2, int p3, String data);
@@ -548,7 +548,7 @@ interface ITelephony { 
     *            is sent to the SIM.

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

     * @return The APDU response from the ICC card with the status appended at

     *            the end. If an error occurs, an empty string is returned.

     *            the end.

     */

    String iccTransmitApduBasicChannel(int cla, int instruction,

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