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

Browse source 
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
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(); abort();
} }
/* TODO update default waiting time based on usage data */ constexpr unsigned int shutdownTimeoutDefault = 6;
constexpr unsigned int shutdownTimeoutDefault = 10;
unsigned int shutdownTimeout = shutdownTimeoutDefault; unsigned int shutdownTimeout = shutdownTimeoutDefault;
if (SHUTDOWN_ZERO_TIMEOUT) { // eng build if (SHUTDOWN_ZERO_TIMEOUT) { // eng build
shutdownTimeout = 0; shutdownTimeout = 0;