| commit | 6f6e5bb89bf7019b57fc746de76913141b999c59 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Wed May 27 13:48:36 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 27 13:48:36 2015 +0000 |
| tree | d5f4c109941ecb866ddabb30883aa4df08039942 | |
| parent | 6d1d7ffa051a3aaba40c9ca2ea7d68c0465e0a52 [diff] | |
| parent | 41928ce61da9b4e328f361f8295f83bd1149d430 [diff] |
am 41928ce6: Merge "Revert "recovery: change the way of rebooting when using power key combo"" * commit '41928ce61da9b4e328f361f8295f83bd1149d430': Revert "recovery: change the way of rebooting when using power key combo"
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;