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

Commit a2cbf016 authored by Nazanin Bakhshi's avatar Nazanin Bakhshi Committed by android-build-merger
Browse files

Merge "Make isRebootRequiredForModemConfigChange SystemApi" am: 55faf374 

am: 367a7baf

Change-Id: I23e289d24c918004596a465f3f572b63bb0f0879
parents 89ce4bd4 367a7baf

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -6343,6 +6343,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
@@ -10183,11 +10183,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
@@ -1850,6 +1850,7 @@ interface ITelephony { 
    int getNumOfActiveSims();

    /**

     * Get if reboot is required upon altering modems configurations

     * @hide

     */

    boolean isRebootRequiredForModemConfigChange();

}