commit 99277fa6afbb416d9428c3931bd1230c9e78cc15
author Treehugger Robot <treehugger-gerrit@google.com> Tue Aug 18 03:05:47 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 18 03:05:47 2020 +0000
tree 9c61709deac3a727ef109d3734903446d22a0f72
parent 435a5fc0c288c0134edc597c2297a602602be108
parent 9ebf0653bf99b3971e0f86193bf360071bda5098

Merge "Return the correct action for PromptAndWait"

recovery.cpp

diff --git a/recovery.cpp b/recovery.cpp
index d26424a..09738eb 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;