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

Return the correct action for PromptAndWait

Browse source 
Bug: 163613552
Test: mma
Change-Id: I204f6aa272c2b56725e658e5613530b27bd223c6
This commit is contained in:
Kelvin Zhang 2020-08-13 18:15:17 -04:00
parent 435a5fc0c2
commit 9ebf0653bf
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::SHUTDOWN:
if (!ui->IsTextVisible()) {
return Device::REBOOT;
return chosen_action;
}
// okay to reboot; no need to ask.
if (!update_in_progress) {
return Device::REBOOT;
return chosen_action;
}
// An update might have been failed. Ask if user really wants to reboot.
if (AskToReboot(device, chosen_action)) {
return Device::REBOOT;
return chosen_action;
}
break;