summaryrefslogtreecommitdiffstats
path: root/recovery.cpp
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2015-05-28 02:09:06 +0200
committerAndroid Git Automerger <android-git-automerger@android.com>2015-05-28 02:09:06 +0200
commit0b78610085aef48aa9ea422106be92337695d3e6 (patch)
tree1740d5e309610ce3dc8c808b508450ff6eb34009 /recovery.cpp
parentam e6f54e74: am 7b126d77: am 73151b51: Merge "recovery: change the way of rebooting when using power key combo" (diff)
parentam 9a5e2a26: am f272b9e7: Merge "Clean up the sleep()\'s after poking init services" (diff)
downloadandroid_bootable_recovery-0b78610085aef48aa9ea422106be92337695d3e6.tar
android_bootable_recovery-0b78610085aef48aa9ea422106be92337695d3e6.tar.gz
android_bootable_recovery-0b78610085aef48aa9ea422106be92337695d3e6.tar.bz2
android_bootable_recovery-0b78610085aef48aa9ea422106be92337695d3e6.tar.lz
android_bootable_recovery-0b78610085aef48aa9ea422106be92337695d3e6.tar.xz
android_bootable_recovery-0b78610085aef48aa9ea422106be92337695d3e6.tar.zst
android_bootable_recovery-0b78610085aef48aa9ea422106be92337695d3e6.zip
Diffstat (limited to 'recovery.cpp')
-rw-r--r--recovery.cpp19
1 files changed, 11 insertions, 8 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;
}