From feefbf2f5698a5a56adb80a057dba0bc07050c09 Mon Sep 17 00:00:00 2001
From: Tao Bao <tbao@google.com>
Date: Wed, 22 May 2019 18:03:01 +0000
Subject: Revert "recovery: report compliant reboot reason"

This reverts commit 6f4e4db4f9e0911a07c6393d01e4380e844f7891.

Reason for revert: Booting out of recovery (choose `Reboot system now`)
on taimen is broken. Device keeps booting back into recovery.

Bug: 133326470
Test: Choose `Reboot system now` from recovery menu. Deivce attempts
      normal boot.
Change-Id: I6e85fc248e18953a6fb94513c3abc7e7e0fb0477
---
 fastboot/fastboot.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'fastboot/fastboot.cpp')

diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp
index 202334997..14f5e4bdc 100644
--- a/fastboot/fastboot.cpp
+++ b/fastboot/fastboot.cpp
@@ -30,10 +30,10 @@
 #include "recovery_ui/ui.h"
 
 static const std::vector<std::pair<std::string, Device::BuiltinAction>> kFastbootMenuActions{
-  { "Reboot system now", Device::REBOOT_FROM_FASTBOOT },
+  { "Reboot system now", Device::REBOOT },
   { "Enter recovery", Device::ENTER_RECOVERY },
   { "Reboot to bootloader", Device::REBOOT_BOOTLOADER },
-  { "Power off", Device::SHUTDOWN_FROM_FASTBOOT },
+  { "Power off", Device::SHUTDOWN },
 };
 
 Device::BuiltinAction StartFastboot(Device* device, const std::vector<std::string>& /* args */) {
-- 
cgit v1.2.3