| commit | 6120de8285186ba8f146de860720b1240152b20c | [log] [tgz] |
|---|---|---|
| author | Keun-young Park <keunyoung@google.com> | Thu Apr 27 02:10:16 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Apr 27 02:10:17 2017 +0000 |
| tree | 3c8b0474eba39f0d1e5feed237199a0ce20f1a3c | |
| parent | 13fcdbf84ca5b1bcf43798c7da1e0479506647d5 [diff] | |
| parent | d4bd55b689451abd0ade56ec1f62312835e9a1cf [diff] |
Merge "set default shutdown timeout to 6 secs" into oc-dev
diff --git a/init/reboot.cpp b/init/reboot.cpp index 7970b4a..c1edf7c 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;