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

Commit 118895f5 authored by Jordan Liu's avatar Jordan Liu
Browse files

Add slot based ICC channel APIs 

These are SystemApis which require MODIFY_PHONE_STATE, and can be used
to open ICC channels when there is no available subscription, using the
slot index instead of subId.

Bug: 126578014
Test: builds
Change-Id: I3f47a8ac07813ea9e326c7d76123352708bfeea2
Merged-In: I3f47a8ac07813ea9e326c7d76123352708bfeea2
parent 96f51fd9

api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -6396,6 +6396,10 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getVoiceActivationState();

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean handlePinMmi(String);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean handlePinMmiForSubscriber(int, String);

    method @Nullable @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean iccCloseLogicalChannelBySlot(int, int);

    method @Nullable @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public android.telephony.IccOpenLogicalChannelResponse iccOpenLogicalChannelBySlot(int, @Nullable String, int);

    method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public String iccTransmitApduBasicChannelBySlot(int, int, int, int, int, int, @Nullable String);

    method @Nullable @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public String iccTransmitApduLogicalChannelBySlot(int, int, int, int, int, int, int, @Nullable String);

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isCurrentPotentialEmergencyNumber(@NonNull String);

    method public boolean isDataConnectivityPossible();

    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isIdle();

telephony/java/android/telephony/TelephonyManager.java

+150 −2
Original line number Diff line number Diff line
@@ -5162,6 +5162,40 @@ public class TelephonyManager { 
        return iccOpenLogicalChannel(getSubId(), AID, -1);

    }



    /**

     * Opens a logical channel to the ICC card using the physical slot index.

     *

     * Use this method when no subscriptions are available on the SIM and the operation must be

     * performed using the physical slot index.

     *

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

     *

     * <p>Requires Permission:

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

     *

     * @param slotIndex the physical slot index of the ICC card

     * @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

     */

    @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)

    @SystemApi

    @Nullable

    public IccOpenLogicalChannelResponse iccOpenLogicalChannelBySlot(int slotIndex,

            @Nullable String aid, int p2) {

        try {

            ITelephony telephony = getITelephony();

            if (telephony != null) {

                return telephony.iccOpenLogicalChannelBySlot(slotIndex, getOpPackageName(), aid,

                        p2);

            }

        } catch (RemoteException ex) {

        } catch (NullPointerException ex) {

        }

        return null;

    }



    /**

     * Opens a logical channel to the ICC card.

     *
@@ -5205,6 +5239,38 @@ public class TelephonyManager { 
        return null;

    }



    /**

     * Closes a previously opened logical channel to the ICC card using the physical slot index.

     *

     * Use this method when no subscriptions are available on the SIM and the operation must be

     * performed using the physical slot index.

     *

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

     *

     * <p>Requires Permission:

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

     *

     * @param slotIndex the physical slot index of the ICC card

     * @param channel is the channel id to be closed as returned by a successful

     *            iccOpenLogicalChannel.

     * @return true if the channel was closed successfully.

     * @hide

     */

    @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)

    @SystemApi

    @Nullable

    public boolean iccCloseLogicalChannelBySlot(int slotIndex, int channel) {

        try {

            ITelephony telephony = getITelephony();

            if (telephony != null) {

                return telephony.iccCloseLogicalChannelBySlot(slotIndex, channel);

            }

        } catch (RemoteException ex) {

        } catch (NullPointerException ex) {

        }

        return false;

    }



    /**

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

     *
@@ -5214,7 +5280,7 @@ public class TelephonyManager { 
     * {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE} or that the calling

     * app has carrier privileges (see {@link #hasCarrierPrivileges}).

     *

     * @param channel is the channel id to be closed as retruned by a successful

     * @param channel is the channel id to be closed as returned by a successful

     *            iccOpenLogicalChannel.

     * @return true if the channel was closed successfully.

     */
@@ -5232,7 +5298,7 @@ public class TelephonyManager { 
     * app has carrier privileges (see {@link #hasCarrierPrivileges}).

     *

     * @param subId The subscription to use.

     * @param channel is the channel id to be closed as retruned by a successful

     * @param channel is the channel id to be closed as returned by a successful

     *            iccOpenLogicalChannel.

     * @return true if the channel was closed successfully.

     * @hide
@@ -5248,6 +5314,48 @@ public class TelephonyManager { 
        return false;

    }



    /**

     * Transmit an APDU to the ICC card over a logical channel using the physical slot index.

     *

     * Use this method when no subscriptions are available on the SIM and the operation must be

     * performed using the physical slot index.

     *

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

     *

     * <p>Requires Permission:

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

     *

     * @param slotIndex the physical slot index of the ICC card

     * @param channel is the channel id to be closed as returned by a successful

     *            iccOpenLogicalChannel.

     * @param cla Class of the APDU command.

     * @param instruction Instruction of the APDU command.

     * @param p1 P1 value of the APDU command.

     * @param p2 P2 value of the APDU command.

     * @param p3 P3 value of the APDU command. If p3 is negative a 4 byte APDU

     *            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.

     * @hide

     */

    @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)

    @SystemApi

    @Nullable

    public String iccTransmitApduLogicalChannelBySlot(int slotIndex, int channel, int cla,

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

        try {

            ITelephony telephony = getITelephony();

            if (telephony != null) {

                return telephony.iccTransmitApduLogicalChannelBySlot(slotIndex, channel, cla,

                        instruction, p1, p2, p3, data);

            }

        } catch (RemoteException ex) {

        } catch (NullPointerException ex) {

        }

        return null;

    }



    /**

     * Transmit an APDU to the ICC card over a logical channel.

     *
@@ -5311,6 +5419,46 @@ public class TelephonyManager { 
        return "";

    }



    /**

     * Transmit an APDU to the ICC card over the basic channel using the physical slot index.

     *

     * Use this method when no subscriptions are available on the SIM and the operation must be

     * performed using the physical slot index.

     *

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

     *

     * <p>Requires Permission:

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

     *

     * @param slotIndex the physical slot index of the ICC card to target

     * @param cla Class of the APDU command.

     * @param instruction Instruction of the APDU command.

     * @param p1 P1 value of the APDU command.

     * @param p2 P2 value of the APDU command.

     * @param p3 P3 value of the APDU command. If p3 is negative a 4 byte APDU

     *            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.

     * @hide

     */

    @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)

    @SystemApi

    @NonNull

    public String iccTransmitApduBasicChannelBySlot(int slotIndex, int cla, int instruction, int p1,

            int p2, int p3, @Nullable String data) {

        try {

            ITelephony telephony = getITelephony();

            if (telephony != null) {

                return telephony.iccTransmitApduBasicChannelBySlot(slotIndex, getOpPackageName(),

                        cla, instruction, p1, p2, p3, data);

            }

        } catch (RemoteException ex) {

        } catch (NullPointerException ex) {

        }

        return null;

    }



    /**

     * Transmit an APDU to the ICC card over the basic channel.

     *

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

+69 −2
Original line number Diff line number Diff line
@@ -552,6 +552,20 @@ interface ITelephony { 
     */

    void setCellInfoListRate(int rateInMillis);



    /**

     * Opens a logical channel to the ICC card using the physical slot index.

     *

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

     *

     * @param slotIndex The physical slot index of the target ICC card

     * @param callingPackage the name of the package making the call.

     * @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 iccOpenLogicalChannelBySlot(

            int slotIndex, String callingPackage, String AID, int p2);



    /**

     * Opens a logical channel to the ICC card.

     *
@@ -566,26 +580,59 @@ interface ITelephony { 
    IccOpenLogicalChannelResponse iccOpenLogicalChannel(

            int subId, String callingPackage, String AID, int p2);



    /**

     * Closes a previously opened logical channel to the ICC card using the physical slot index.

     *

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

     *

     * @param slotIndex The physical slot index of the target ICC card

     * @param channel is the channel id to be closed as returned by a

     *            successful iccOpenLogicalChannel.

     * @return true if the channel was closed successfully.

     */

    boolean iccCloseLogicalChannelBySlot(int slotIndex, int channel);



    /**

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

     *

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

     *

     * @param subId The subscription to use.

     * @param channel is the channel id to be closed as retruned by a

     * @param channel is the channel id to be closed as returned by a

     *            successful iccOpenLogicalChannel.

     * @return true if the channel was closed successfully.

     */

    @UnsupportedAppUsage

    boolean iccCloseLogicalChannel(int subId, int channel);



    /**

     * Transmit an APDU to the ICC card over a logical channel using the physical slot index.

     *

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

     *

     * @param slotIndex The physical slot index of the target ICC card

     * @param channel is the channel id to be closed as returned by a

     *            successful iccOpenLogicalChannel.

     * @param cla Class of the APDU command.

     * @param instruction Instruction of the APDU command.

     * @param p1 P1 value of the APDU command.

     * @param p2 P2 value of the APDU command.

     * @param p3 P3 value of the APDU command. If p3 is negative a 4 byte APDU

     *            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.

     */

    String iccTransmitApduLogicalChannelBySlot(int slotIndex, int channel, int cla, int instruction,

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



    /**

     * Transmit an APDU to the ICC card over a logical channel.

     *

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

     *

     * @param subId The subscription to use.

     * @param channel is the channel id to be closed as retruned by a

     * @param channel is the channel id to be closed as returned by a

     *            successful iccOpenLogicalChannel.

     * @param cla Class of the APDU command.

     * @param instruction Instruction of the APDU command.
@@ -601,6 +648,26 @@ interface ITelephony { 
    String iccTransmitApduLogicalChannel(int subId, int channel, int cla, int instruction,

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



    /**

     * Transmit an APDU to the ICC card over the basic channel using the physical slot index.

     *

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

     *

     * @param slotIndex The physical slot index of the target ICC card

     * @param callingPackage the name of the package making the call.

     * @param cla Class of the APDU command.

     * @param instruction Instruction of the APDU command.

     * @param p1 P1 value of the APDU command.

     * @param p2 P2 value of the APDU command.

     * @param p3 P3 value of the APDU command. If p3 is negative a 4 byte APDU

     *            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.

     */

    String iccTransmitApduBasicChannelBySlot(int slotIndex, String callingPackage, int cla,

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



    /**

     * Transmit an APDU to the ICC card over the basic channel.

     *