summaryrefslogtreecommitdiffstats
path: root/recovery.cpp
diff options
context:
space:
mode:
authorKelvin Zhang <zhangkelvin@google.com>2020-08-14 00:15:17 +0200
committerKelvin Zhang <zhangkelvin@google.com>2020-08-14 00:16:40 +0200
commit9ebf0653bf99b3971e0f86193bf360071bda5098 (patch)
tree9c61709deac3a727ef109d3734903446d22a0f72 /recovery.cpp
parentMerge changes I0f3f0333,If447b2cf (diff)
downloadandroid_bootable_recovery-9ebf0653bf99b3971e0f86193bf360071bda5098.tar
android_bootable_recovery-9ebf0653bf99b3971e0f86193bf360071bda5098.tar.gz
android_bootable_recovery-9ebf0653bf99b3971e0f86193bf360071bda5098.tar.bz2
android_bootable_recovery-9ebf0653bf99b3971e0f86193bf360071bda5098.tar.lz
android_bootable_recovery-9ebf0653bf99b3971e0f86193bf360071bda5098.tar.xz
android_bootable_recovery-9ebf0653bf99b3971e0f86193bf360071bda5098.tar.zst
android_bootable_recovery-9ebf0653bf99b3971e0f86193bf360071bda5098.zip
Diffstat (limited to '')
-rw-r--r--recovery.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/recovery.cpp b/recovery.cpp
index d26424ab1..09738eb85 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -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;