openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "set default shutdown timeout to 6 secs" am: 47d15ed5b9 

am: 0020d4c076

Change-Id: I1c0b4552ebc5e52475b4bd98e82a837137be7f6b
This commit is contained in:
Keun-young Park 2017-04-26 22:47:00 +00:00 committed by android-build-merger
parent a15436569f 0020d4c076
commit 09c780db3a
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
init/reboot.cpp
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;