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

* commit '6f6e5bb89bf7019b57fc746de76913141b999c59':
  Revert "recovery: change the way of rebooting when using power key combo"
This commit is contained in:
Nick Kralevich 2015-05-27 14:03:23 +00:00 committed by Android Git Automerger
commit 8af11cffeb

3
ui.cpp
View file

@ -174,8 +174,7 @@ void RecoveryUI::ProcessKey(int key_code, int updown) {
case RecoveryUI::REBOOT:
if (reboot_enabled) {
property_set(ANDROID_RB_PROPERTY, "reboot,");
while(1) { pause(); }
android_reboot(ANDROID_RB_RESTART, 0, 0);
}
break;