commit 770e7c6f70d7e992376a3118a79ac2fcb83d22f1
author Nick Kralevich <nnk@google.com> Wed May 27 14:17:00 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed May 27 14:17:00 2015 +0000
tree d5f4c109941ecb866ddabb30883aa4df08039942
parent 9f4ae3d5482fc2cc6d7d74204ee59f33cfe7cf1d
parent 8af11cffeb3ebe44300ce9066b547d35ab0c6815

am 8af11cff: am 6f6e5bb8: am 41928ce6: Merge "Revert "recovery: change the way of rebooting when using power key combo""

* commit '8af11cffeb3ebe44300ce9066b547d35ab0c6815':
  Revert "recovery: change the way of rebooting when using power key combo"

ui.cpp

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