commit 9f4ae3d5482fc2cc6d7d74204ee59f33cfe7cf1d
author Nick Kralevich <nnk@google.com> Wed May 27 13:40:37 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed May 27 13:40:37 2015 +0000
tree f4f390f7d6b8421e32863e3b2e64461650c628dc
parent 1a0fb83d705b4866c5adee223f3ab49a22f3a333
parent f0e2927d7c534693bb06a675fde08f2fdf423669

am f0e2927d: am 6d1d7ffa: am b48bdbed: Merge "recovery: change the way of rebooting when using power key combo"

* commit 'f0e2927d7c534693bb06a675fde08f2fdf423669':
  recovery: change the way of rebooting when using power key combo

ui.cpp

diff --git a/ui.cpp b/ui.cpp
index 1a0b079..2b1a6af 100644
--- a/ui.cpp
+++ b/ui.cpp
@@ -174,7 +174,8 @@
 
           case RecoveryUI::REBOOT:
             if (reboot_enabled) {
-                android_reboot(ANDROID_RB_RESTART, 0, 0);
+                property_set(ANDROID_RB_PROPERTY, "reboot,");
+                while(1) { pause(); }
             }
             break;