am 000c009b: Merge "Reduce the coldboot timeout to 1s."

* commit '000c009bcc71bf8218d20c5575d3ae44c8bd4cda':
  Reduce the coldboot timeout to 1s.
This commit is contained in:
Elliott Hughes 2015-05-14 20:22:50 +00:00 committed by Android Git Automerger
commit bca8dc6a44
1 changed files with 4 additions and 1 deletions

View File

@ -618,7 +618,10 @@ static int wait_for_coldboot_done_action(int nargs, char **args) {
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);
}