diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-08-18 03:33:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-18 03:33:23 +0000 |
| commit | b5d418af521c6b08931f286dcec238f73d85c8aa (patch) | |
| tree | a8c621b2347eefde22661ec5adeaa0a669c65ad3 /recovery.cpp | |
| parent | 435f3d3f16c27678fcd0ddd01efd2092208bce1a (diff) | |
| parent | c55e7fd95decbe41ca18f7a4d36df110e7cbd165 (diff) | |
Merge "Return the correct action for PromptAndWait" am: 99277fa6af am: c55e7fd95d
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1398888
Change-Id: Ie2d0b0dc1d5f6383fac4142cab4391816a419ab1
Diffstat (limited to 'recovery.cpp')
| -rw-r--r-- | recovery.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/recovery.cpp b/recovery.cpp index 84deeb45..36924fbd 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; |