commit d4bd55b689451abd0ade56ec1f62312835e9a1cf
author Keun-young Park <keunyoung@google.com> Wed Apr 26 12:36:14 2017 -0700
committer Keun-young Park <keunyoung@google.com> Wed Apr 26 17:06:53 2017 -0700
tree 5e306d5a2c32f9d9d778f5db861fb14cef3fca74
parent 56f0a8c4b5883e75ec6fd118cd6bd17704020582

set default shutdown timeout to 6 secs

- Test data shows that most shutdown finishes in 6 secs.
- The original 10 secs is too long wih no shutdown animation
  running in screen.

bug: 36657139
Test: check time with reboot

(cherry picked from commit 7feab6823885cb591f9239e01235d2ed529f2b69)

Change-Id: I2e0ec81baa7b6cdb1ff0163c16f643c2549d74ab

init/reboot.cpp

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;