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 am: 09c780db3a 

am: 6c61e087e4

Change-Id: I5ed4c11b86d3976c383f0b16b4b96ffd141830ef
This commit is contained in:
Keun-young Park 2017-04-26 22:55:32 +00:00 committed by android-build-merger
parent 66dacba26c 6c61e087e4
commit 29f4ee9d36
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;