From 782dcc1996f6b39ef9e085d7153c2f109ff2609a Mon Sep 17 00:00:00 2001
From: Tao Bao <tbao@google.com>
Date: Mon, 29 Apr 2019 11:23:16 -0700
Subject: Consolidate the codes that handle reboot/shutdown.

Test: Choose `Reboot system now`, `Power off`, `Reboot to bootloader`
      from recovery UI respectively.
Test: `adb reboot recovery` while under sideload mode.
Change-Id: I0f3d55b80b472178ea4f6970b29cd9df0778b639
---
 recovery.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'recovery.cpp')

diff --git a/recovery.cpp b/recovery.cpp
index 5fc673ec2..42dad4129 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -895,8 +895,8 @@ Device::BuiltinAction start_recovery(Device* device, const std::vector<std::stri
           // Print retry count on screen.
           ui->Print("Retry attempt %d\n", retry_count);
 
-          // Reboot and retry the update
-          if (!reboot("reboot,recovery")) {
+          // Reboot back into recovery to retry the update.
+          if (!Reboot("recovery")) {
             ui->Print("Reboot failed\n");
           } else {
             while (true) {
-- 
cgit v1.2.3