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

Commit 84eef057 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "READ_PHONE_STATE permission for isModemEnabledForSlot" into rvc-dev am:... 

Merge "READ_PHONE_STATE permission for isModemEnabledForSlot" into rvc-dev am: b6e24590 am: e5d80d66 am: b486e3c8 am: eea8791c

Change-Id: Icaf226aa156ba3902b6f30ed7c2e528db3b9b296
parents e28e202b eea8791c

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -48224,6 +48224,7 @@ package android.telephony { 
    method public boolean isEmergencyNumber(@NonNull String);

    method public boolean isHearingAidCompatibilitySupported();

    method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRECISE_PHONE_STATE, "android.permission.READ_PRIVILEGED_PHONE_STATE"}) public boolean isManualNetworkSelectionAllowed();

    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public boolean isModemEnabledForSlot(int);

    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public int isMultiSimSupported();

    method public boolean isNetworkRoaming();

    method public boolean isRttSupported();

api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -11638,7 +11638,6 @@ package android.telephony { 
    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isIdle();

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

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

    method public boolean isModemEnabledForSlot(int);

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

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

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

telephony/java/android/telephony/TelephonyManager.java

+5 −3
Original line number Diff line number Diff line
@@ -12225,12 +12225,14 @@ public class TelephonyManager { 


    /**

     * It indicates whether modem is enabled or not per slot.

     * It's the corresponding status of {@link #enableModemForSlot}.

     * It's the corresponding status of TelephonyManager.enableModemForSlot.

     *

     * <p>Requires Permission:

     * READ_PRIVILEGED_PHONE_STATE or

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

     * @param slotIndex which slot it's checking.

     * @hide

     */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)

    public boolean isModemEnabledForSlot(int slotIndex) {

        try {

            ITelephony telephony = getITelephony();