summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-08-18 06:30:14 +0200
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-08-18 06:30:14 +0200
commit8762648bcf57fe302364be37c7a8a703e861c050 (patch)
treefeb188cedd5c42884bcbeda6e7be44c26e0b4fb2
parent[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f81364cd8c -s ours am: f810978038 -s ours am: 59274b4765 -s ours am: 3d9de410e4 -s ours (diff)
parentMerge "Return the correct action for PromptAndWait" am: 99277fa6af am: c55e7fd95d am: b5d418af52 am: 4360c29cf7 am: 7f269b07c1 (diff)
downloadandroid_bootable_recovery-8762648bcf57fe302364be37c7a8a703e861c050.tar
android_bootable_recovery-8762648bcf57fe302364be37c7a8a703e861c050.tar.gz
android_bootable_recovery-8762648bcf57fe302364be37c7a8a703e861c050.tar.bz2
android_bootable_recovery-8762648bcf57fe302364be37c7a8a703e861c050.tar.lz
android_bootable_recovery-8762648bcf57fe302364be37c7a8a703e861c050.tar.xz
android_bootable_recovery-8762648bcf57fe302364be37c7a8a703e861c050.tar.zst
android_bootable_recovery-8762648bcf57fe302364be37c7a8a703e861c050.zip
-rw-r--r--recovery.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/recovery.cpp b/recovery.cpp
index 84deeb45f..36924fbdf 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;