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

Commit e58f91a3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Allow modify phone state permission"

parents 7d148d1b 09869621

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -43182,7 +43182,7 @@ package android.telephony { 
    method public boolean isDataCapable();

    method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_NETWORK_STATE, android.Manifest.permission.READ_PHONE_STATE, "android.permission.READ_PRIVILEGED_PHONE_STATE"}) public boolean isDataConnectionAllowed();

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

    method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_NETWORK_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isDataEnabledForReason(int);

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

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

    method public boolean isEmergencyNumber(@NonNull String);

    method public boolean isHearingAidCompatibilitySupported();

telephony/java/android/telephony/TelephonyManager.java

+6 −3
Original line number Diff line number Diff line
@@ -12620,16 +12620,19 @@ public class TelephonyManager { 
     * <p>If this object has been created with {@link #createForSubscriptionId}, applies

     *      to the given subId. Otherwise, applies to

     * {@link SubscriptionManager#getDefaultDataSubscriptionId()}

     *

     * @param reason the reason the data enable change is taking place

     * @return whether data is enabled for a reason.

     * <p>Requires Permission:

     * The calling app has carrier privileges (see {@link #hasCarrierPrivileges}) or

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

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

     * {@link android.Manifest.permission#ACCESS_NETWORK_STATE} or

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

     * @throws IllegalStateException if the Telephony process is not currently available.

     */

    @RequiresPermission(anyOf = {android.Manifest.permission.ACCESS_NETWORK_STATE,

            android.Manifest.permission.READ_PHONE_STATE})

            android.Manifest.permission.READ_PHONE_STATE,

            android.Manifest.permission.MODIFY_PHONE_STATE

    })

    public boolean isDataEnabledForReason(@DataEnabledReason int reason) {

        return isDataEnabledForReason(getSubId(), reason);

    }