diff options
| -rw-r--r-- | core/api/current.txt | 2 | ||||
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 6936ca724c38..4ba6bf4043c3 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -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(); diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index a1d68b215ba5..e410a4c5a1f3 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -12411,16 +12411,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); } |