Merge "set default shutdown timeout to 6 secs" into oc-dev

This commit is contained in:
Keun-young Park 2017-04-27 02:10:16 +00:00 committed by Android (Google) Code Review
commit 55bb3a9f75

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;