| commit | ddcdf46281ad9cb146497dd34de5e5c49dc0eb07 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu May 14 12:03:14 2015 -0700 |
| committer | Elliott Hughes <enh@google.com> | Thu May 14 12:03:14 2015 -0700 |
| tree | b7c716a370787f1d1b71ebd057a821e5f3711cc8 | |
| parent | 2cac09bf4d79250011cf0c5ecf42da0cf0a80a8f [diff] |
Reduce the coldboot timeout to 1s. 5s was already a ridiculously long time to delay booting, and some OEMs are trying to make it even more insane: https://www.codeaurora.org/cgit/quic/la/platform/system/core/commit/?h=lp&id=fd23edd48272976d2fb333f377242173f92aa343 Let's at least ensure that Nexus and Android One devices don't take forever to boot... Bug: http://b/19899875 Change-Id: I9680c166a759360f34118e51cd0645e12b6bd5c8
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); }