commit 4360c29cf7fe2860b7b105720eb7a5dba2f2b7de
author Treehugger Robot <treehugger-gerrit@google.com> Tue Aug 18 03:44:23 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Aug 18 03:44:23 2020 +0000
tree a8c621b2347eefde22661ec5adeaa0a669c65ad3
parent 40abfc5d4d0b3fe8e6c3e562b77a79e69db34b10
parent b5d418af521c6b08931f286dcec238f73d85c8aa

Merge "Return the correct action for PromptAndWait" am: 99277fa6af am: c55e7fd95d am: b5d418af52

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

Change-Id: I70131aeb3dd61b165c6671bf26f8e69e5381433d

recovery.cpp

diff --git a/recovery.cpp b/recovery.cpp
index 84deeb4..36924fb 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -421,15 +421,15 @@
       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;