diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-08-18 05:33:23 +0200 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-18 05:33:23 +0200 |
commit | b5d418af521c6b08931f286dcec238f73d85c8aa (patch) | |
tree | a8c621b2347eefde22661ec5adeaa0a669c65ad3 | |
parent | Merge changes I0f3f0333,If447b2cf am: 435a5fc0c2 am: 74538db684 (diff) | |
parent | Merge "Return the correct action for PromptAndWait" am: 99277fa6af (diff) | |
download | android_bootable_recovery-b5d418af521c6b08931f286dcec238f73d85c8aa.tar android_bootable_recovery-b5d418af521c6b08931f286dcec238f73d85c8aa.tar.gz android_bootable_recovery-b5d418af521c6b08931f286dcec238f73d85c8aa.tar.bz2 android_bootable_recovery-b5d418af521c6b08931f286dcec238f73d85c8aa.tar.lz android_bootable_recovery-b5d418af521c6b08931f286dcec238f73d85c8aa.tar.xz android_bootable_recovery-b5d418af521c6b08931f286dcec238f73d85c8aa.tar.zst android_bootable_recovery-b5d418af521c6b08931f286dcec238f73d85c8aa.zip |
-rw-r--r-- | recovery.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/recovery.cpp b/recovery.cpp index 84deeb45f..36924fbdf 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; |