diff options
| author | SongFerng Wang <songferngwang@google.com> | 2020-01-07 04:34:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-01-07 04:34:59 +0000 |
| commit | 6297d2548d16e3a235dd06b4ff08e947eac4a57f (patch) | |
| tree | 56cd8d01e1b860cc363e5a9b6ff1fbcc2ac4f7df | |
| parent | 93318a40ee7059a19938ffcd674f6876db5dfc60 (diff) | |
| parent | 780bdfa39cf7e73dfa24f86fefb1fb16ffe1bc91 (diff) | |
| download | base-6297d2548d16e3a235dd06b4ff08e947eac4a57f.tar.gz | |
Merge "isTetheringApnRequired's permission is wrong."
| -rwxr-xr-x | api/system-current.txt | 2 | ||||
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 8a3dad7ec04c..4a9154ee9875 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -9014,7 +9014,7 @@ package android.telephony { method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isPotentialEmergencyNumber(@NonNull String); method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isRadioOn(); method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isRinging(); - method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isTetheringApnRequired(); + method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean isTetheringApnRequired(); method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isVideoCallingEnabled(); method @Deprecated @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public boolean isVisualVoicemailEnabled(android.telecom.PhoneAccountHandle); method public boolean modifyDevicePolicyOverrideApn(@NonNull android.content.Context, int, @NonNull android.telephony.data.ApnSetting); diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index e57032ae4b95..87bdaa9a9fe4 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -7577,12 +7577,12 @@ public class TelephonyManager { /** * Check whether DUN APN is required for tethering. * <p> - * Requires Permission: READ_PRIVILEGED_PHONE_STATE. + * Requires Permission: MODIFY_PHONE_STATE. * * @return {@code true} if DUN APN is required for tethering. * @hide */ - @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) + @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @SystemApi public boolean isTetheringApnRequired() { return isTetheringApnRequired(getSubId(SubscriptionManager.getActiveDataSubscriptionId())); |