summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2015-05-27 23:46:17 +0200
committerTao Bao <tbao@google.com>2015-05-27 23:48:56 +0200
commit752386319c0d9fb7e4e429a0644086b318d3b4b5 (patch)
tree1740d5e309610ce3dc8c808b508450ff6eb34009
parentMerge "recovery: change the way of rebooting when using power key combo" (diff)
downloadandroid_bootable_recovery-752386319c0d9fb7e4e429a0644086b318d3b4b5.tar
android_bootable_recovery-752386319c0d9fb7e4e429a0644086b318d3b4b5.tar.gz
android_bootable_recovery-752386319c0d9fb7e4e429a0644086b318d3b4b5.tar.bz2
android_bootable_recovery-752386319c0d9fb7e4e429a0644086b318d3b4b5.tar.lz
android_bootable_recovery-752386319c0d9fb7e4e429a0644086b318d3b4b5.tar.xz
android_bootable_recovery-752386319c0d9fb7e4e429a0644086b318d3b4b5.tar.zst
android_bootable_recovery-752386319c0d9fb7e4e429a0644086b318d3b4b5.zip
-rw-r--r--recovery.cpp19
-rw-r--r--ui.cpp2
-rw-r--r--uncrypt/uncrypt.cpp12
3 files changed, 20 insertions, 13 deletions
diff --git a/recovery.cpp b/recovery.cpp
index 80a8c7ba5..bfc68950c 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -31,24 +31,24 @@
#include <time.h>
#include <unistd.h>
+#include <adb.h>
#include <base/file.h>
#include <base/stringprintf.h>
+#include <cutils/android_reboot.h>
+#include <cutils/properties.h>
+#include "adb_install.h"
#include "bootloader.h"
#include "common.h"
-#include "cutils/properties.h"
-#include "cutils/android_reboot.h"
+#include "device.h"
+#include "fuse_sdcard_provider.h"
+#include "fuse_sideload.h"
#include "install.h"
#include "minui/minui.h"
#include "minzip/DirUtil.h"
#include "roots.h"
#include "ui.h"
#include "screen_ui.h"
-#include "device.h"
-#include "adb_install.h"
-#include "adb.h"
-#include "fuse_sideload.h"
-#include "fuse_sdcard_provider.h"
struct selabel_handle *sehandle;
@@ -1119,6 +1119,9 @@ main(int argc, char **argv) {
property_set(ANDROID_RB_PROPERTY, "reboot,");
break;
}
- sleep(5); // should reboot before this finishes
+ while (true) {
+ pause();
+ }
+ // Should be unreachable.
return EXIT_SUCCESS;
}
diff --git a/ui.cpp b/ui.cpp
index d88cbfeba..2efb759db 100644
--- a/ui.cpp
+++ b/ui.cpp
@@ -176,7 +176,7 @@ void RecoveryUI::ProcessKey(int key_code, int updown) {
case RecoveryUI::REBOOT:
if (reboot_enabled) {
property_set(ANDROID_RB_PROPERTY, "reboot,");
- while(1) { pause(); }
+ while (true) { pause(); }
}
break;
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?");
}