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

Commit 1ec46998 authored by Chen Xu's avatar Chen Xu Committed by Android (Google) Code Review
Browse files

Merge "SDK API doesSwitchModemConfigTriggerReboot"

parents b2a41769 c320f2cb

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -45108,6 +45108,7 @@ package android.telephony { 
    method public boolean canChangeDtmfToneLength();

    method @Nullable public android.telephony.TelephonyManager createForPhoneAccountHandle(android.telecom.PhoneAccountHandle);

    method public android.telephony.TelephonyManager createForSubscriptionId(int);

    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public boolean doesSwitchMultiSimConfigTriggerReboot();

    method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public java.util.List<android.telephony.CellInfo> getAllCellInfo();

    method public int getCallState();

    method public int getCardIdForDefaultEuicc();

api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -8063,7 +8063,6 @@ package android.telephony { 
    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 isPotentialEmergencyNumber(@NonNull String);

    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

+13 −9
Original line number Diff line number Diff line
@@ -10861,24 +10861,28 @@ public class TelephonyManager { 
    }



    /**

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

     * Get whether making changes to modem configurations by {@link #switchMultiSimConfig(int)} will

     * trigger device reboot.

     * 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

     *  <p>Requires Permission:

     * {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE} or that the

     * calling app has carrier privileges (see {@link #hasCarrierPrivileges}).

     *

     * @return {@code true} if reboot will be triggered after making changes to modem

     * configurations, otherwise return {@code false}.

     */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)

    public boolean isRebootRequiredForModemConfigChange() {

    @RequiresPermission(Manifest.permission.READ_PHONE_STATE)

    public boolean doesSwitchMultiSimConfigTriggerReboot() {

        try {

            ITelephony service = getITelephony();

            if (service != null) {

                return service.isRebootRequiredForModemConfigChange();

                return service.doesSwitchMultiSimConfigTriggerReboot(getSubId(),

                        getOpPackageName());

            }

        } catch (RemoteException e) {

            Log.e(TAG, "isRebootRequiredForModemConfigChange RemoteException", e);

            Log.e(TAG, "doesSwitchMultiSimConfigTriggerReboot RemoteException", e);

        }

        return false;

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -1945,10 +1945,10 @@ interface ITelephony { 
    void switchMultiSimConfig(int numOfSims);



    /**

     * Get if reboot is required upon altering modems configurations

     * Get if altering modems configurations will trigger reboot.

     * @hide

     */

    boolean isRebootRequiredForModemConfigChange();

    boolean doesSwitchMultiSimConfigTriggerReboot(int subId, String callingPackage);



    /**

     * Get the mapping from logical slots to physical slots.