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

Commit 04b4c461 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "isTetheringApnRequired's permission is wrong." am: 6297d254 am: bdce8daa am: 281310f1 

Change-Id: I7768a96a105d637c0293a0c94bc76967db722006
parents 78cdc140 281310f1

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -10107,7 +10107,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);

telephony/java/android/telephony/TelephonyManager.java

+2 −2
Original line number Diff line number Diff line
@@ -7773,12 +7773,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()));