commit 752386319c0d9fb7e4e429a0644086b318d3b4b5
author Tao Bao <tbao@google.com> Wed May 27 14:46:17 2015 -0700
committer Tao Bao <tbao@google.com> Wed May 27 14:48:56 2015 -0700
tree 1740d5e309610ce3dc8c808b508450ff6eb34009
parent 73151b5101c132091d5853dd635b3fc941f242dc

Clean up the sleep()'s after poking init services

Change-Id: I77564fe5c59e604f1377b278681b7d1bff53a77a

recovery.cpp

diff --git a/recovery.cpp b/recovery.cpp
index 80a8c7b..bfc6895 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 @@
             property_set(ANDROID_RB_PROPERTY, "reboot,");
             break;
     }
-    sleep(5); // should reboot before this finishes
+    while (true) {
+      pause();
+    }
+    // Should be unreachable.
     return EXIT_SUCCESS;
 }