Merge "set default shutdown timeout to 6 secs"

am: 47d15ed5b9

Change-Id: I076911247627894009490047caa9f04b8e616755
This commit is contained in:
Keun-young Park 2017-04-26 22:43:29 +00:00 committed by android-build-merger
commit 0020d4c076
1 changed files with 1 additions and 2 deletions

View File

@ -318,8 +318,7 @@ void DoReboot(unsigned int cmd, const std::string& reason, const std::string& re
abort();
}
/* TODO update default waiting time based on usage data */
constexpr unsigned int shutdownTimeoutDefault = 10;
constexpr unsigned int shutdownTimeoutDefault = 6;
unsigned int shutdownTimeout = shutdownTimeoutDefault;
if (SHUTDOWN_ZERO_TIMEOUT) { // eng build
shutdownTimeout = 0;