tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Return the correct action for PromptAndWait" am: 99277fa6af am: c55e7fd95d am: b5d418af52 am: 4360c29cf7 am: 7f269b07c1

Browse source 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1398888

Change-Id: I1c611157b4c31957cf873ed3390f38f9d759499e
This commit is contained in:
Treehugger Robot 2020-08-18 04:15:03 +00:00 committed by Automerger Merge Worker
commit de8e518668
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
recovery.cpp
View file

@ -421,15 +421,15 @@ static Device::BuiltinAction PromptAndWait(Device* device, InstallResult status)
case Device::REBOOT: case Device::REBOOT:
case Device::SHUTDOWN: case Device::SHUTDOWN:
if (!ui->IsTextVisible()) { if (!ui->IsTextVisible()) {
return Device::REBOOT; return chosen_action;
} }
// okay to reboot; no need to ask. // okay to reboot; no need to ask.
if (!update_in_progress) { if (!update_in_progress) {
return Device::REBOOT; return chosen_action;
} }
// An update might have been failed. Ask if user really wants to reboot. // An update might have been failed. Ask if user really wants to reboot.
if (AskToReboot(device, chosen_action)) { if (AskToReboot(device, chosen_action)) {
return Device::REBOOT; return chosen_action;
} }
break; break;