diff options
author | Tao Bao <tbao@google.com> | 2015-05-28 01:13:38 +0200 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-05-28 01:17:13 +0200 |
commit | f272b9e777de92f96b9298889bf145e40c5db2e3 (patch) | |
tree | 1740d5e309610ce3dc8c808b508450ff6eb34009 /uncrypt | |
parent | Merge "recovery: change the way of rebooting when using power key combo" (diff) | |
parent | Clean up the sleep()'s after poking init services (diff) | |
download | android_bootable_recovery-f272b9e777de92f96b9298889bf145e40c5db2e3.tar android_bootable_recovery-f272b9e777de92f96b9298889bf145e40c5db2e3.tar.gz android_bootable_recovery-f272b9e777de92f96b9298889bf145e40c5db2e3.tar.bz2 android_bootable_recovery-f272b9e777de92f96b9298889bf145e40c5db2e3.tar.lz android_bootable_recovery-f272b9e777de92f96b9298889bf145e40c5db2e3.tar.xz android_bootable_recovery-f272b9e777de92f96b9298889bf145e40c5db2e3.tar.zst android_bootable_recovery-f272b9e777de92f96b9298889bf145e40c5db2e3.zip |
Diffstat (limited to 'uncrypt')
-rw-r--r-- | uncrypt/uncrypt.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/uncrypt/uncrypt.cpp b/uncrypt/uncrypt.cpp index 11766f14c..d71271d8e 100644 --- a/uncrypt/uncrypt.cpp +++ b/uncrypt/uncrypt.cpp @@ -40,18 +40,20 @@ // file data to use as an update package. #include <errno.h> +#include <fcntl.h> +#include <linux/fs.h> +#include <stdarg.h> #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <stdarg.h> #include <sys/types.h> #include <sys/stat.h> -#include <fcntl.h> -#include <linux/fs.h> #include <sys/mman.h> +#include <unistd.h> #define LOG_TAG "uncrypt" #include <log/log.h> +#include <cutils/android_reboot.h> #include <cutils/properties.h> #include <fs_mgr.h> @@ -376,7 +378,9 @@ static void wipe_misc() { static void reboot_to_recovery() { ALOGI("rebooting to recovery"); property_set("sys.powerctl", "reboot,recovery"); - sleep(10); + while (true) { + pause(); + } ALOGE("reboot didn't succeed?"); } |