commit 8aa011b4f713e5abd511c234545d81520e3adc17
author Keun-young Park <keunyoung@google.com> Wed Apr 26 22:47:00 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Apr 26 22:47:00 2017 +0000
tree c4002d91b41b8aef5b826c39eeb8a11acfdd0ba5
parent 7a5fb3c98071f11e3d703c107343d87497eba5d7
parent 11f9b5815eafab62781420624a435b0e9a71aa6b

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

Change-Id: I1c0b4552ebc5e52475b4bd98e82a837137be7f6b

init/reboot.cpp

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;