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

Commit 9c113787 authored by Amit Mahajan's avatar Amit Mahajan Committed by android-build-merger
Browse files

Merge "Add p2 option in openLogicalChannel." am: f954f2d5 

am: 7c6fa755

Change-Id: Iee6b5873353ea10262c9268989cbe5c2fd946cc7
parents f63f5c74 7c6fa755

api/current.txt

+2 −1
Original line number Diff line number Diff line
@@ -38205,7 +38205,8 @@ package android.telephony { 
    method public boolean hasIccCard();

    method public boolean iccCloseLogicalChannel(int);

    method public byte[] iccExchangeSimIO(int, int, int, int, int, java.lang.String);

    method public android.telephony.IccOpenLogicalChannelResponse iccOpenLogicalChannel(java.lang.String);

    method public deprecated android.telephony.IccOpenLogicalChannelResponse iccOpenLogicalChannel(java.lang.String);

    method public android.telephony.IccOpenLogicalChannelResponse iccOpenLogicalChannel(java.lang.String, int);

    method public java.lang.String iccTransmitApduBasicChannel(int, int, int, int, int, java.lang.String);

    method public java.lang.String iccTransmitApduLogicalChannel(int, int, int, int, int, int, java.lang.String);

    method public boolean isHearingAidCompatibilitySupported();

api/system-current.txt

+2 −1
Original line number Diff line number Diff line
@@ -41424,7 +41424,8 @@ package android.telephony { 
    method public boolean hasIccCard();

    method public boolean iccCloseLogicalChannel(int);

    method public byte[] iccExchangeSimIO(int, int, int, int, int, java.lang.String);

    method public android.telephony.IccOpenLogicalChannelResponse iccOpenLogicalChannel(java.lang.String);

    method public deprecated android.telephony.IccOpenLogicalChannelResponse iccOpenLogicalChannel(java.lang.String);

    method public android.telephony.IccOpenLogicalChannelResponse iccOpenLogicalChannel(java.lang.String, int);

    method public java.lang.String iccTransmitApduBasicChannel(int, int, int, int, int, java.lang.String);

    method public java.lang.String iccTransmitApduLogicalChannel(int, int, int, int, int, int, java.lang.String);

    method public boolean isDataConnectivityPossible();

api/test-current.txt

+2 −1
Original line number Diff line number Diff line
@@ -38304,7 +38304,8 @@ package android.telephony { 
    method public boolean hasIccCard();

    method public boolean iccCloseLogicalChannel(int);

    method public byte[] iccExchangeSimIO(int, int, int, int, int, java.lang.String);

    method public android.telephony.IccOpenLogicalChannelResponse iccOpenLogicalChannel(java.lang.String);

    method public deprecated android.telephony.IccOpenLogicalChannelResponse iccOpenLogicalChannel(java.lang.String);

    method public android.telephony.IccOpenLogicalChannelResponse iccOpenLogicalChannel(java.lang.String, int);

    method public java.lang.String iccTransmitApduBasicChannel(int, int, int, int, int, java.lang.String);

    method public java.lang.String iccTransmitApduLogicalChannel(int, int, int, int, int, int, java.lang.String);

    method public boolean isHearingAidCompatibilitySupported();

telephony/java/android/telephony/TelephonyManager.java

+23 −3
Original line number Diff line number Diff line
@@ -3502,9 +3502,28 @@ public class TelephonyManager { 
     *

     * @param AID Application id. See ETSI 102.221 and 101.220.

     * @return an IccOpenLogicalChannelResponse object.

     * @deprecated Replaced by {@link #iccOpenLogicalChannel(String, int)}

     */

    @Deprecated

    public IccOpenLogicalChannelResponse iccOpenLogicalChannel(String AID) {

        return iccOpenLogicalChannel(getSubId(), AID);

        return iccOpenLogicalChannel(getSubId(), AID, -1);

    }



    /**

     * Opens a logical channel to the ICC card.

     *

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

     *

     * <p>Requires Permission:

     *   {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE}

     * Or the calling app has carrier privileges. @see #hasCarrierPrivileges

     *

     * @param AID Application id. See ETSI 102.221 and 101.220.

     * @param p2 P2 parameter (described in ISO 7816-4).

     * @return an IccOpenLogicalChannelResponse object.

     */

    public IccOpenLogicalChannelResponse iccOpenLogicalChannel(String AID, int p2) {

        return iccOpenLogicalChannel(getSubId(), AID, p2);

    }



    /**
@@ -3518,14 +3537,15 @@ public class TelephonyManager { 
     *

     * @param subId The subscription to use.

     * @param AID Application id. See ETSI 102.221 and 101.220.

     * @param p2 P2 parameter (described in ISO 7816-4).

     * @return an IccOpenLogicalChannelResponse object.

     * @hide

     */

    public IccOpenLogicalChannelResponse iccOpenLogicalChannel(int subId, String AID) {

    public IccOpenLogicalChannelResponse iccOpenLogicalChannel(int subId, String AID, int p2) {

        try {

            ITelephony telephony = getITelephony();

            if (telephony != null)

                return telephony.iccOpenLogicalChannel(subId, AID);

                return telephony.iccOpenLogicalChannel(subId, AID, p2);

        } catch (RemoteException ex) {

        } catch (NullPointerException ex) {

        }

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

+2 −1
Original line number Diff line number Diff line
@@ -592,9 +592,10 @@ interface ITelephony { 
     *

     * @param subId The subscription to use.

     * @param AID Application id. See ETSI 102.221 and 101.220.

     * @param p2 P2 parameter (described in ISO 7816-4).

     * @return an IccOpenLogicalChannelResponse object.

     */

    IccOpenLogicalChannelResponse iccOpenLogicalChannel(int subId, String AID);

    IccOpenLogicalChannelResponse iccOpenLogicalChannel(int subId, String AID, int p2);



    /**

     * Closes a previously opened logical channel to the ICC card.