Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Check RescueParty before using SysUI reboot message" into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-02-28 21:41:25 +00:00
committed by Android (Google) Code Review
parent 3a05f90073 8c6ce78b96
commit 500c65f41e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/power/ShutdownThread.java
View File

@@ -315,15 +315,15 @@ 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 (showSysuiReboot()) {
return null;
} else if (RescueParty.isAttemptingFactoryReset()) {
if (RescueParty.isAttemptingFactoryReset()) {
// 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.
pd.setTitle(context.getText(com.android.internal.R.string.power_off));
pd.setMessage(context.getText(com.android.internal.R.string.shutdown_progress));
pd.setIndeterminate(true);
} else if (showSysuiReboot()) {
return null;
} else {
// Factory reset path. Set the dialog message accordingly.
pd.setTitle(context.getText(com.android.internal.R.string.reboot_to_reset_title));