commit de8e51866858316310f13eba27cce363c082871b
author Treehugger Robot <treehugger-gerrit@google.com> Tue Aug 18 04:15:03 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Aug 18 04:15:03 2020 +0000
tree c927227a33bd0c156326dd91e0b79b6a9b9185f5
parent 3d9de410e4bc3581357b128859f53ff9828e257a
parent 7f269b07c1360f3655225a10dcb7fce9999ddbce

Merge "Return the correct action for PromptAndWait" am: 99277fa6af am: c55e7fd95d am: b5d418af52 am: 4360c29cf7 am: 7f269b07c1

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

Change-Id: I1c611157b4c31957cf873ed3390f38f9d759499e

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;