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

Commit 9f6f2e79 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Make isRebootRequiredForModemConfigChange SystemApi" am:... 

Merge "Merge "Make isRebootRequiredForModemConfigChange SystemApi" am: 55faf374 am: 367a7baf am: a2cbf016"
parents 826f9b6c 1e843dee

api/system-current.txt

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

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

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

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

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

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

telephony/java/android/telephony/TelephonyManager.java

+5 −2
Original line number Diff line number Diff line
@@ -10309,11 +10309,14 @@ public class TelephonyManager { 


    /**

     * Get whether reboot is required or not after making changes to modem configurations.

     * @Return {@code True} if reboot is required after making changes to modem configurations,

     * otherwise return {@code False}.

     * The modem configuration change refers to switching from single SIM configuration to DSDS

     * or the other way around.

     * @Return {@code true} if reboot is required after making changes to modem configurations,

     * otherwise return {@code false}.

     *

     * @hide

     */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)

    public boolean isRebootRequiredForModemConfigChange() {

        try {

telephony/java/com/android/internal/telephony/ITelephony.aidl

+2 −1
Original line number Diff line number Diff line
@@ -1846,6 +1846,7 @@ interface ITelephony { 


    /**

     * Get if reboot is required upon altering modems configurations

     * @hide

     */

    boolean isRebootRequiredForModemConfigChange();