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

Commit d9832ed2 authored by Rambo Wang's avatar Rambo Wang
Browse files

Deprecate some UICC related APIs in TelephonyManager 

In specific, the following APIs are marked deprecated:
- TelephonyManager#iccOpenLogicalChannel
- TelephonyManager#iccCloseLogicalChannel
- TelephonyManager#iccCloseLogicalChannelBySlot
- TelephonyManager#iccTransmitApduLogicalChannel
- TelephonyManager#iccTransmitApduLogicalChannelBySlot
- TelephonyManager#iccTransmitApduBasicChannel
- TelephonyManager#iccTransmitApduBasicChannelBySlot
- TelephonyManager#iccExchangeSimIO
- TelephonyManager#sendEnvelopeWithStatus

The comments of the APIs are updated, suggesting to switch to
android.se.omapi.SEService APIs instead.

Telephony APIs do not provide any resource management for opened
logical channels, so it's easy for apps to open channels and
never close them. Secure Element Service does provide resource
management, so we are directing apps to use those APIs instead.

Bug: 146360599
Test: N/A
Change-Id: Id44402c637aaa77c77ee7672e0ceddf1bee20f7c
parent 6109ea3b

api/current.txt

+6 −6
Original line number Diff line number Diff line
@@ -45459,12 +45459,12 @@ package android.telephony { 
    method public android.net.Uri getVoicemailRingtoneUri(android.telecom.PhoneAccountHandle);

    method public boolean hasCarrierPrivileges();

    method public boolean hasIccCard();

    method public boolean iccCloseLogicalChannel(int);

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

    method @Deprecated public boolean iccCloseLogicalChannel(int);

    method @Deprecated public byte[] iccExchangeSimIO(int, int, int, int, int, String);

    method @Deprecated public android.telephony.IccOpenLogicalChannelResponse iccOpenLogicalChannel(String);

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

    method public String iccTransmitApduBasicChannel(int, int, int, int, int, String);

    method public String iccTransmitApduLogicalChannel(int, int, int, int, int, int, String);

    method @Deprecated public android.telephony.IccOpenLogicalChannelResponse iccOpenLogicalChannel(String, int);

    method @Deprecated public String iccTransmitApduBasicChannel(int, int, int, int, int, String);

    method @Deprecated public String iccTransmitApduLogicalChannel(int, int, int, int, int, int, String);

    method public boolean isConcurrentVoiceAndDataSupported();

    method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_NETWORK_STATE, android.Manifest.permission.MODIFY_PHONE_STATE}) public boolean isDataEnabled();

    method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_NETWORK_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isDataRoamingEnabled();
@@ -45482,7 +45482,7 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public void requestCellInfoUpdate(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.TelephonyManager.CellInfoCallback);

    method @RequiresPermission(allOf={android.Manifest.permission.MODIFY_PHONE_STATE, android.Manifest.permission.ACCESS_FINE_LOCATION}) public android.telephony.NetworkScan requestNetworkScan(android.telephony.NetworkScanRequest, java.util.concurrent.Executor, android.telephony.TelephonyScanManager.NetworkScanCallback);

    method public void sendDialerSpecialCode(String);

    method public String sendEnvelopeWithStatus(String);

    method @Deprecated public String sendEnvelopeWithStatus(String);

    method @RequiresPermission(android.Manifest.permission.CALL_PHONE) public void sendUssdRequest(String, android.telephony.TelephonyManager.UssdResponseCallback, android.os.Handler);

    method public void sendVisualVoicemailSms(String, int, String, android.app.PendingIntent);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataEnabled(boolean);

api/system-current.txt

+3 −3
Original line number Diff line number Diff line
@@ -8980,10 +8980,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 @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean iccCloseLogicalChannelBySlot(int, int);

    method @Deprecated @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 @Deprecated @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public String iccTransmitApduBasicChannelBySlot(int, int, int, int, int, int, @Nullable String);

    method @Deprecated @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 isAnyRadioPoweredOn();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isApplicationOnUicc(int);

    method public boolean isDataConnectivityPossible();

telephony/java/android/telephony/TelephonyManager.java

+45 −0
Original line number Diff line number Diff line
@@ -5681,7 +5681,10 @@ public class TelephonyManager { 
     * @param AID Application id. See ETSI 102.221 and 101.220.

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

     * @return an IccOpenLogicalChannelResponse object.

     * @deprecated Use {@link android.se.omapi.SEService} APIs instead.

     */

    // TODO(b/147153909): Update Javadoc to link to specific SEService API once integrated.

    @Deprecated

    public IccOpenLogicalChannelResponse iccOpenLogicalChannel(String AID, int p2) {

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

    }
@@ -5712,7 +5715,10 @@ public class TelephonyManager { 
     * @param p2 P2 parameter (described in ISO 7816-4).

     * @return an IccOpenLogicalChannelResponse object.

     * @hide

     * @deprecated Use {@link android.se.omapi.SEService} APIs instead.

     */

    // TODO(b/147153909): Update Javadoc to link to specific SEService API once integrated.

    @Deprecated

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

        try {

            ITelephony telephony = getITelephony();
@@ -5740,7 +5746,10 @@ public class TelephonyManager { 
     *            iccOpenLogicalChannel.

     * @return true if the channel was closed successfully.

     * @hide

     * @deprecated Use {@link android.se.omapi.SEService} APIs instead.

     */

    // TODO(b/147153909): Update Javadoc to link to specific SEService API once integrated.

    @Deprecated

    @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)

    @SystemApi

    public boolean iccCloseLogicalChannelBySlot(int slotIndex, int channel) {
@@ -5767,7 +5776,10 @@ public class TelephonyManager { 
     * @param channel is the channel id to be closed as returned by a successful

     *            iccOpenLogicalChannel.

     * @return true if the channel was closed successfully.

     * @deprecated Use {@link android.se.omapi.SEService} APIs instead.

     */

    // TODO(b/147153909): Update Javadoc to link to specific SEService API once integrated.

    @Deprecated

    public boolean iccCloseLogicalChannel(int channel) {

        return iccCloseLogicalChannel(getSubId(), channel);

    }
@@ -5786,7 +5798,10 @@ public class TelephonyManager { 
     *            iccOpenLogicalChannel.

     * @return true if the channel was closed successfully.

     * @hide

     * @deprecated Use {@link android.se.omapi.SEService} APIs instead.

     */

    // TODO(b/147153909): Update Javadoc to link to specific SEService API once integrated.

    @Deprecated

    public boolean iccCloseLogicalChannel(int subId, int channel) {

        try {

            ITelephony telephony = getITelephony();
@@ -5822,7 +5837,10 @@ public class TelephonyManager { 
     * @return The APDU response from the ICC card with the status appended at the end, or null if

     * there is an issue connecting to the Telephony service.

     * @hide

     * @deprecated Use {@link android.se.omapi.SEService} APIs instead.

     */

    // TODO(b/147153909): Update Javadoc to link to specific SEService API once integrated.

    @Deprecated

    @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)

    @SystemApi

    @Nullable
@@ -5860,7 +5878,10 @@ public class TelephonyManager { 
     * @param data Data to be sent with the APDU.

     * @return The APDU response from the ICC card with the status appended at

     *            the end.

     * @deprecated Use {@link android.se.omapi.SEService} APIs instead.

     */

    // TODO(b/147153909): Update Javadoc to link to specific SEService API once integrated.

    @Deprecated

    public String iccTransmitApduLogicalChannel(int channel, int cla,

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

        return iccTransmitApduLogicalChannel(getSubId(), channel, cla,
@@ -5889,7 +5910,10 @@ public class TelephonyManager { 
     * @return The APDU response from the ICC card with the status appended at

     *            the end.

     * @hide

     * @deprecated Use {@link android.se.omapi.SEService} APIs instead.

     */

    // TODO(b/147153909): Update Javadoc to link to specific SEService API once integrated.

    @Deprecated

    public String iccTransmitApduLogicalChannel(int subId, int channel, int cla,

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

        try {
@@ -5925,7 +5949,10 @@ public class TelephonyManager { 
     * @return The APDU response from the ICC card with the status appended at

     *            the end.

     * @hide

     * @deprecated Use {@link android.se.omapi.SEService} APIs instead.

     */

    // TODO(b/147153909): Update Javadoc to link to specific SEService API once integrated.

    @Deprecated

    @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)

    @SystemApi

    @NonNull
@@ -5961,7 +5988,10 @@ public class TelephonyManager { 
     * @param data Data to be sent with the APDU.

     * @return The APDU response from the ICC card with the status appended at

     *            the end.

     * @deprecated Use {@link android.se.omapi.SEService} APIs instead.

     */

    // TODO(b/147153909): Update Javadoc to link to specific SEService API once integrated.

    @Deprecated

    public String iccTransmitApduBasicChannel(int cla,

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

        return iccTransmitApduBasicChannel(getSubId(), cla,
@@ -5988,7 +6018,10 @@ public class TelephonyManager { 
     * @return The APDU response from the ICC card with the status appended at

     *            the end.

     * @hide

     * @deprecated Use {@link android.se.omapi.SEService} APIs instead.

     */

    // TODO(b/147153909): Update Javadoc to link to specific SEService API once integrated.

    @Deprecated

    public String iccTransmitApduBasicChannel(int subId, int cla,

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

        try {
@@ -6016,7 +6049,10 @@ public class TelephonyManager { 
     * @param p3 P3 value of the APDU command.

     * @param filePath

     * @return The APDU response.

     * @deprecated Use {@link android.se.omapi.SEService} APIs instead.

     */

    // TODO(b/147153909): Update Javadoc to link to specific SEService API once integrated.

    @Deprecated

    public byte[] iccExchangeSimIO(int fileID, int command, int p1, int p2, int p3,

            String filePath) {

        return iccExchangeSimIO(getSubId(), fileID, command, p1, p2, p3, filePath);
@@ -6038,7 +6074,10 @@ public class TelephonyManager { 
     * @param filePath

     * @return The APDU response.

     * @hide

     * @deprecated Use {@link android.se.omapi.SEService} APIs instead.

     */

    // TODO(b/147153909): Update Javadoc to link to specific SEService API once integrated.

    @Deprecated

    public byte[] iccExchangeSimIO(int subId, int fileID, int command, int p1, int p2,

            int p3, String filePath) {

        try {
@@ -6064,7 +6103,10 @@ public class TelephonyManager { 
     * @return The APDU response from the ICC card in hexadecimal format

     *         with the last 4 bytes being the status word. If the command fails,

     *         returns an empty string.

     * @deprecated Use {@link android.se.omapi.SEService} APIs instead.

     */

    // TODO(b/147153909): Update Javadoc to link to specific SEService API once integrated.

    @Deprecated

    public String sendEnvelopeWithStatus(String content) {

        return sendEnvelopeWithStatus(getSubId(), content);

    }
@@ -6084,7 +6126,10 @@ public class TelephonyManager { 
     *         with the last 4 bytes being the status word. If the command fails,

     *         returns an empty string.

     * @hide

     * @deprecated Use {@link android.se.omapi.SEService} APIs instead.

     */

    // TODO(b/147153909): Update Javadoc to link to specific SEService API once integrated.

    @Deprecated

    public String sendEnvelopeWithStatus(int subId, String content) {

        try {

            ITelephony telephony = getITelephony();