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

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

Merge "Fixing build breakage due to: c4d41755"

parents 3b3508fe 37589084

telephony/java/android/telephony/TelephonyManager.java

+2 −2
Original line number Diff line number Diff line
@@ -1493,10 +1493,10 @@ public class TelephonyManager { 
     *            the end. If an error occurs, an empty string is returned.

     */

    public String iccTransmitApduLogicalChannel(int channel, int cla,

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

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

        try {

          return getITelephony().iccTransmitApduLogicalChannel(channel, cla,

                  command, p1, p2, p3, data);

                  instruction, p1, p2, p3, data);

        } catch (RemoteException ex) {

        } catch (NullPointerException ex) {

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -363,6 +363,6 @@ interface ITelephony { 
     * @return The APDU response from the ICC card with the status appended at

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

     */

    String iccTransmitApduLogicalChannel(int channel, int cla, int command,

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

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

}