ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
am: 09c780db3a

Change-Id: I38ec920f5034b2adc9ab8354144cae1fe554d753
This commit is contained in:
Keun-young Park 2017-04-26 22:49:02 +00:00 • committed by android-build-merger
commit 6c61e087e4
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;