Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow modify phone state permission" am: 56f6d8d8a9 am: 37a3ed2805

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

Change-Id: Iea34290eb9a7f0cd97a7ebc5206677cf3b7d735b
This commit is contained in:
Treehugger Robot
2021-12-02 23:53:26 +00:00
committed by Automerger Merge Worker
parent d6948b9583 37a3ed2805
commit f7f152eaa2
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/current.txt
View File

@@ -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();

9
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -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);
} }