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

Commit 5d7734c6 authored by Hyungjun Park's avatar Hyungjun Park Committed by android-build-merger
Browse files

Merge "Add isApplicationOnUicc API" am: 3dc68a95 

am: 2f3eb5d8

Change-Id: I2deb2fbfba218f50a24656ec9e9f636335749a34
parents 793c72e6 2f3eb5d8

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -8147,6 +8147,7 @@ package android.telephony { 
    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 isApplicationOnUicc(int);

    method public boolean isDataConnectivityPossible();

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

    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

+25 −0
Original line number Diff line number Diff line
@@ -3202,6 +3202,31 @@ public class TelephonyManager { 
        }

    }





    /**

     * Returns true if the specified type of application (e.g. {@link #APPTYPE_CSIM} is present

     * on the UICC card.

     *

     * Requires that the calling app has READ_PRIVILEGED_PHONE_STATE permission

     *

     * @param appType the uicc app type like {@link APPTYPE_CSIM}

     * @return true if the specified type of application in UICC CARD or false if no uicc or error.

     * @hide

     */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)

    public boolean isApplicationOnUicc(@UiccAppType int appType) {

        try {

            ITelephony service = getITelephony();

            if (service != null) {

                return service.isApplicationOnUicc(getSubId(), appType);

            }

        } catch (RemoteException e) {

            Log.e(TAG, "Error calling ITelephony#isApplicationOnUicc", e);

        }

        return false;

    }



    /**

     * Returns a constant indicating the state of the device SIM card in a logical slot.

     *

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

+7 −0
Original line number Diff line number Diff line
@@ -2008,6 +2008,13 @@ interface ITelephony { 
     */

    int getRadioHalVersion();



    /**

     * Returns true if the specified type of application (e.g. {@link #APPTYPE_CSIM} is present

     * on the UICC card.

     * @hide

     */

    boolean isApplicationOnUicc(int subId, int appType);



    boolean isModemEnabledForSlot(int slotIndex, String callingPackage);



    boolean isDataEnabledForApn(int apnType, int subId, String callingPackage);