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

Commit eca5ebb0 authored by Ajay Nambi's avatar Ajay Nambi Committed by Wileen Chiu
Browse files

Add p2 option in openLogicalChannel. 

- Add support for iccOpenLogicalChannelWithP2.
- Needed to support OMAPI 3.0 defined
by SIM Alliance.
- Deprecate iccOpenLogicalChannel(String) API and
pass down an invalid p2 value to keep original behavior

Bug: 27360148
Change-Id: I2ab6cfb7a54c451f32936df51b8298f35a6dc67f
parent 41f5b61f

api/current.txt

+3 −2
Original line number Diff line number Diff line
@@ -23822,8 +23822,8 @@ package android.net { 
    method public void reportNetworkConnectivity(android.net.Network, boolean);

    method public boolean requestBandwidthUpdate(android.net.Network);

    method public void requestNetwork(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback);

    method public void requestNetwork(android.net.NetworkRequest, int, android.net.ConnectivityManager.NetworkCallback);

    method public void requestNetwork(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback, android.os.Handler);

    method public void requestNetwork(android.net.NetworkRequest, int, android.net.ConnectivityManager.NetworkCallback);

    method public void requestNetwork(android.net.NetworkRequest, int, android.net.ConnectivityManager.NetworkCallback, android.os.Handler);

    method public void requestNetwork(android.net.NetworkRequest, android.app.PendingIntent);

    method public deprecated boolean requestRouteToHost(int, int);
@@ -38240,7 +38240,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

+3 −2
Original line number Diff line number Diff line
@@ -25609,8 +25609,8 @@ package android.net { 
    method public void reportNetworkConnectivity(android.net.Network, boolean);

    method public boolean requestBandwidthUpdate(android.net.Network);

    method public void requestNetwork(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback);

    method public void requestNetwork(android.net.NetworkRequest, int, android.net.ConnectivityManager.NetworkCallback);

    method public void requestNetwork(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback, android.os.Handler);

    method public void requestNetwork(android.net.NetworkRequest, int, android.net.ConnectivityManager.NetworkCallback);

    method public void requestNetwork(android.net.NetworkRequest, int, android.net.ConnectivityManager.NetworkCallback, android.os.Handler);

    method public void requestNetwork(android.net.NetworkRequest, android.app.PendingIntent);

    method public deprecated boolean requestRouteToHost(int, int);
@@ -41463,7 +41463,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

+3 −2
Original line number Diff line number Diff line
@@ -23895,8 +23895,8 @@ package android.net { 
    method public void reportNetworkConnectivity(android.net.Network, boolean);

    method public boolean requestBandwidthUpdate(android.net.Network);

    method public void requestNetwork(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback);

    method public void requestNetwork(android.net.NetworkRequest, int, android.net.ConnectivityManager.NetworkCallback);

    method public void requestNetwork(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback, android.os.Handler);

    method public void requestNetwork(android.net.NetworkRequest, int, android.net.ConnectivityManager.NetworkCallback);

    method public void requestNetwork(android.net.NetworkRequest, int, android.net.ConnectivityManager.NetworkCallback, android.os.Handler);

    method public void requestNetwork(android.net.NetworkRequest, android.app.PendingIntent);

    method public deprecated boolean requestRouteToHost(int, int);
@@ -38322,7 +38322,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
@@ -3464,9 +3464,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);

    }



    /**
@@ -3480,14 +3499,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.