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

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

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

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

Change-Id: I39c70722d7ba70e49c98e3758fa8b7f3a6662034
parents ffabccb8 56f6d8d8
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -42793,7 +42793,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();
+6 −3
Original line number Diff line number Diff line
@@ -12414,16 +12414,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);
    }