commit 6d1d7ffa051a3aaba40c9ca2ea7d68c0465e0a52
author Nick Kralevich <nnk@google.com> Wed May 27 13:19:10 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed May 27 13:19:10 2015 +0000
tree f4f390f7d6b8421e32863e3b2e64461650c628dc
parent 0b1d15742f4cc7f930981fc63ee74b5df51ce719
parent b48bdbeda03af04ec8e0d52f6af680a9062eb916

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

* commit 'b48bdbeda03af04ec8e0d52f6af680a9062eb916':
  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;