summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-08-18 06:02:09 +0200
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-08-18 06:02:09 +0200
commit7f269b07c1360f3655225a10dcb7fce9999ddbce (patch)
treea8c621b2347eefde22661ec5adeaa0a669c65ad3
parent[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f81364cd8c -s ours am: f810978038 -s ours (diff)
parentMerge "Return the correct action for PromptAndWait" am: 99277fa6af am: c55e7fd95d am: b5d418af52 (diff)
downloadandroid_bootable_recovery-7f269b07c1360f3655225a10dcb7fce9999ddbce.tar
android_bootable_recovery-7f269b07c1360f3655225a10dcb7fce9999ddbce.tar.gz
android_bootable_recovery-7f269b07c1360f3655225a10dcb7fce9999ddbce.tar.bz2
android_bootable_recovery-7f269b07c1360f3655225a10dcb7fce9999ddbce.tar.lz
android_bootable_recovery-7f269b07c1360f3655225a10dcb7fce9999ddbce.tar.xz
android_bootable_recovery-7f269b07c1360f3655225a10dcb7fce9999ddbce.tar.zst
android_bootable_recovery-7f269b07c1360f3655225a10dcb7fce9999ddbce.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;