commit a58cb83af73beacf0ef6e164d2f8d2d4ba82f484
author android-build-team Robot <android-build-team-robot@google.com> Wed Aug 19 03:24:25 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Aug 19 03:24:25 2020 +0000
tree feb188cedd5c42884bcbeda6e7be44c26e0b4fb2
parent 7c6aa3102676c5a08575e4446bafd5543d1bfc82
parent 8762648bcf57fe302364be37c7a8a703e861c050

Snap for 6774496 from 8762648bcf57fe302364be37c7a8a703e861c050 to sc-d1-release

Change-Id: I7478046722fe785f1ffea17dcf2f114b55b47373

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;