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

Commit f7f152ea authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Allow modify phone state permission" am: 56f6d8d8 am: 37a3ed28 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1885958

Change-Id: Iea34290eb9a7f0cd97a7ebc5206677cf3b7d735b
parents d6948b95 37a3ed28

core/api/current.txt

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

    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.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.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 @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 isEmergencyNumber(@NonNull String);

    method public boolean isHearingAidCompatibilitySupported();

    method public boolean isHearingAidCompatibilitySupported();

telephony/java/android/telephony/TelephonyManager.java

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

     * <p>If this object has been created with {@link #createForSubscriptionId}, applies

     *      to the given subId. Otherwise, applies to

     *      to the given subId. Otherwise, applies to

     * {@link SubscriptionManager#getDefaultDataSubscriptionId()}

     * {@link SubscriptionManager#getDefaultDataSubscriptionId()}

     *

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

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

     * @return whether data is enabled for a reason.

     * @return whether data is enabled for a reason.

     * <p>Requires Permission:

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

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

     */

     */

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

    @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) {

    public boolean isDataEnabledForReason(@DataEnabledReason int reason) {

        return isDataEnabledForReason(getSubId(), reason);

        return isDataEnabledForReason(getSubId(), reason);

    }

    }