diff options
| author | Doug Zongker <dougz@google.com> | 2013-08-30 12:20:16 -0700 |
|---|---|---|
| committer | Doug Zongker <dougz@google.com> | 2013-08-30 12:20:16 -0700 |
| commit | 77ea71d6a85a93c9bf423466e87661b1bf67c512 (patch) | |
| tree | 9b82ab892462977b8cc5ed5d7b27db6e602b7110 | |
| parent | 239ac6abac4524be93fce710360c0512c6cc2ab3 (diff) | |
| download | bootable_recovery-77ea71d6a85a93c9bf423466e87661b1bf67c512.zip bootable_recovery-77ea71d6a85a93c9bf423466e87661b1bf67c512.tar.gz bootable_recovery-77ea71d6a85a93c9bf423466e87661b1bf67c512.tar.bz2 | |
recovery: fix rebooting
Change I84c0513acb549720cb0e8c9fcbda0050f5c396f5 moved reboot
functionality into init but did not update the recovery partition; so
"adb reboot" and /system/bin/reboot in recovery are both broken.
Change-Id: Ie2d14627a686ffb5064256b6c399723636dff116
| -rw-r--r-- | etc/init.rc | 3 | ||||
| -rw-r--r-- | recovery.cpp | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/etc/init.rc b/etc/init.rc index b26d2ae..9d1da1d 100644 --- a/etc/init.rc +++ b/etc/init.rc @@ -38,6 +38,9 @@ on boot class_start default +on property:sys.powerctl=* + powerctl ${sys.powerctl} + service ueventd /sbin/ueventd critical diff --git a/recovery.cpp b/recovery.cpp index 654a665..b783393 100644 --- a/recovery.cpp +++ b/recovery.cpp @@ -1062,6 +1062,6 @@ main(int argc, char **argv) { // Otherwise, get ready to boot the main system... finish_recovery(send_intent); ui->Print("Rebooting...\n"); - android_reboot(ANDROID_RB_RESTART, 0, 0); + property_set(ANDROID_RB_PROPERTY, ""); return EXIT_SUCCESS; } |