diff options
| author | Gabriele M <moto.falcon.git@gmail.com> | 2016-04-11 12:35:40 -0700 |
|---|---|---|
| committer | Ethan Chen <intervigil@gmail.com> | 2016-04-11 12:36:23 -0700 |
| commit | 0373c8deeb21f116354676116cf58e76a94d46a3 (patch) | |
| tree | 9771dcceb08cba46b0815a1343d6a44f51cf5e45 | |
| parent | 48506abb2d2c0ac670d6b85edf56c2cbb99c04df (diff) | |
| download | system_core-0373c8deeb21f116354676116cf58e76a94d46a3.zip system_core-0373c8deeb21f116354676116cf58e76a94d46a3.tar.gz system_core-0373c8deeb21f116354676116cf58e76a94d46a3.tar.bz2 | |
Revert "Revert "init: Temporarily increase coldboot timeout to 5s""
1 second might not be enough for some devices to complete
the coldboot phase, so bring the timeout back to 5 seconds.
This reverts commit c9e804ffd8d4108806eb8162fe7cf35f179b0596.
Change-Id: If10cd4bb1ea66d1c98cdd16f5bfbdae7a04b52e8
| -rw-r--r-- | init/init.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/init.cpp b/init/init.cpp index 402331b..58d7d34 100644 --- a/init/init.cpp +++ b/init/init.cpp @@ -642,7 +642,7 @@ static int wait_for_coldboot_done_action(int nargs, char **args) { // 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)) { + if (wait_for_file(COLDBOOT_DONE, 5)) { ERROR("Timed out waiting for %s\n", COLDBOOT_DONE); } |