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

Commit b8894ab1 authored by Evan Charlton's avatar Evan Charlton
Browse files

Revert "Revert "Modify TelephonyManager to expose sendEnvelopeWithStatus instead of sendEnvelope."" 

This reverts commit f743b163fc764b7ebf701a9e65b13d308530d750.

Change-Id: Ie274a024d2cdb6f11082e6bf391732a304863074
parent 210889e9

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -27112,6 +27112,7 @@ package android.telephony { 
    method public java.lang.String iccTransmitApduLogicalChannel(int, int, int, int, int, int, java.lang.String);

    method public boolean isNetworkRoaming();

    method public void listen(android.telephony.PhoneStateListener, int);

    method public java.lang.String sendEnvelopeWithStatus(java.lang.String);

    field public static final java.lang.String ACTION_PHONE_STATE_CHANGED = "android.intent.action.PHONE_STATE";

    field public static final java.lang.String ACTION_RESPOND_VIA_MESSAGE = "android.intent.action.RESPOND_VIA_MESSAGE";

    field public static final int CALL_STATE_IDLE = 0; // 0x0

telephony/java/android/telephony/TelephonyManager.java

+6 −5
Original line number Diff line number Diff line
@@ -1841,8 +1841,7 @@ public class TelephonyManager { 
    }



    /**

     * Send ENVELOPE to the SIM, after processing a proactive command sent by

     * the SIM.

     * Send ENVELOPE to the SIM and return the response.

     *

     * <p>Requires Permission:

     *   {@link android.Manifest.permission#SIM_COMMUNICATION SIM_COMMUNICATION}
@@ -1850,11 +1849,13 @@ public class TelephonyManager { 
     * @param content String containing SAT/USAT response in hexadecimal

     *                format starting with command tag. See TS 102 223 for

     *                details.

     * @return The APDU response from the ICC card.

     * @return The APDU response from the ICC card, with the last 4 bytes

     *         being the status word. If the command fails, returns an empty

     *         string.

     */

    public String sendEnvelope(String content) {

    public String sendEnvelopeWithStatus(String content) {

        try {

            return getITelephony().sendEnvelope(content);

            return getITelephony().sendEnvelopeWithStatus(content);

        } catch (RemoteException ex) {

        } catch (NullPointerException ex) {

        }

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

+5 −4
Original line number Diff line number Diff line
@@ -373,15 +373,16 @@ interface ITelephony { 
            int p1, int p2, int p3, String data);



    /**

     * Send ENVELOPE to the SIM, after processing a proactive command sent by

     * the SIM.

     * Send ENVELOPE to the SIM and returns the response.

     *

     * @param contents  String containing SAT/USAT response in hexadecimal

     *                  format starting with command tag. See TS 102 223 for

     *                  details.

     * @return The APDU response from the ICC card.

     * @return The APDU response from the ICC card, with the last 4 bytes

     *         being the status word. If the command fails, returns an empty

     *         string.

     */

    String sendEnvelope(String content);

    String sendEnvelopeWithStatus(String content);



    /**

     * Read one of the NV items defined in {@link RadioNVItems} / {@code ril_nv_items.h}.