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

Commit 9c88f88f authored by Yeabkal Wubshit's avatar Yeabkal Wubshit Committed by Android (Google) Code Review
Browse files

Merge "Provide config to prioritize SysUI reboot UI during recovery reboot" into main

parents e53cd2c8 13d1e179

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -7561,4 +7561,7 @@ 
    <string-array name="config_privateSpaceBootCompletedImmediateReceivers" translatable="false">

        <item>com.android.privatespace</item>

    </string-array>



    <!-- Whether Sys UI reboot UI is prioritized for reocvery triggered UI. -->

    <bool name="config_prioritizeSysUiForRecoveryRebootUi">false</bool>

</resources>

core/res/res/values/symbols.xml

+3 −0
Original line number Diff line number Diff line
@@ -6209,4 +6209,7 @@ 


  <!-- The selection toolbar render service component name -->

  <java-symbol type="string" name="config_systemUiSelectionToolbarRenderService" />



  <!-- Whether Sys UI reboot UI is prioritized for reocvery triggered UI. -->

  <java-symbol type="bool" name="config_prioritizeSysUiForRecoveryRebootUi" />

</resources>

services/core/java/com/android/server/power/ShutdownThread.java

+5 −1
Original line number Diff line number Diff line
@@ -339,7 +339,11 @@ public final class ShutdownThread extends Thread { 
                            com.android.internal.R.string.reboot_to_update_reboot));

            }

        } else if (mReason != null && mReason.equals(PowerManager.REBOOT_RECOVERY)) {

            if (PackageWatchdog.isRecoveryTriggeredReboot()) {

            boolean prioritizeSysUiForRecoveryRebootUi = context.getResources().getBoolean(

                    com.android.internal.R.bool.config_prioritizeSysUiForRecoveryRebootUi);

            if (prioritizeSysUiForRecoveryRebootUi && showSysuiReboot()) {

                return null;

            } else if (PackageWatchdog.isRecoveryTriggeredReboot()) {

                // We're not actually doing a factory reset yet; we're rebooting

                // to ask the user if they'd like to reset, so give them a less

                // scary dialog message.