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

Commit 3ea281fe authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Change TelephonyManager#isManualNetworkSelectionAllowed to system api"... 

Merge "Change TelephonyManager#isManualNetworkSelectionAllowed to system api" am: 03cbd5d3 am: 8c349cff

Change-Id: I02a786fbf6ea2b9378ba62159034ba42efb01e56
parents 2759f10a 8c349cff

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -9007,6 +9007,7 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isEmergencyAssistanceEnabled();

    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isIdle();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isInEmergencySmsMode();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isManualNetworkSelectionAllowed();

    method public boolean isModemEnabledForSlot(int);

    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isOffhook();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isOpportunisticNetworkEnabled();

telephony/java/android/telephony/TelephonyManager.java

+2 −1
Original line number Diff line number Diff line
@@ -10400,7 +10400,8 @@ public class TelephonyManager { 
     *

     * @hide

     */

    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)

    @SystemApi

    @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)

    public boolean isManualNetworkSelectionAllowed() {

        try {

            ITelephony telephony = getITelephony();