commit 7c23f76a6db77201c59ea62036ed17294e45c393
author Elliott Hughes <enh@google.com> Thu May 14 20:14:31 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 14 20:14:32 2015 +0000
tree 2e233239d024648b773e949f04d2c748b468a671
parent a680a2cf7cd51c92e4646f716f2ed4bd881ef856
parent ddcdf46281ad9cb146497dd34de5e5c49dc0eb07

Merge "Reduce the coldboot timeout to 1s."

init/init.cpp

diff --git a/init/init.cpp b/init/init.cpp
index 4f46560..60fcf64 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -618,7 +618,10 @@
     Timer t;
 
     NOTICE("Waiting for %s...\n", COLDBOOT_DONE);
-    if (wait_for_file(COLDBOOT_DONE, COMMAND_RETRY_TIMEOUT)) {
+    // Any longer than 1s is an unreasonable length of time to delay booting.
+    // If you're hitting this timeout, check that you didn't make your
+    // sepolicy regular expressions too expensive (http://b/19899875).
+    if (wait_for_file(COLDBOOT_DONE, 1)) {
         ERROR("Timed out waiting for %s\n", COLDBOOT_DONE);
     }