| commit | e22b1df5adaf84d0ead8878f8a31089ad93181af | [log] [tgz] |
|---|---|---|
| author | Keun-young Park <keunyoung@google.com> | Wed Apr 26 22:35:24 2017 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Apr 26 22:35:26 2017 +0000 |
| tree | 96e0adc581471c5282d56f29f12d04525250bd61 | |
| parent | acdfaa828993b71dc9a06336d56203db12aa0485 [diff] | |
| parent | b73918c90d85b1ad9bc13025b205137fe97b927f [diff] |
Merge "set default shutdown timeout to 6 secs"
diff --git a/init/reboot.cpp b/init/reboot.cpp index d6baa26..470b875 100644 --- a/init/reboot.cpp +++ b/init/reboot.cpp
@@ -318,8 +318,7 @@ 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;