commit 11f9b5815eafab62781420624a435b0e9a71aa6b
author Keun-young Park <keunyoung@google.com> Wed Apr 26 22:43:29 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Apr 26 22:43:29 2017 +0000
tree 96e0adc581471c5282d56f29f12d04525250bd61
parent 8d1f9ff03ea4ccd0ed33a77ec057f6ecb708fe69
parent e22b1df5adaf84d0ead8878f8a31089ad93181af

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

Change-Id: I076911247627894009490047caa9f04b8e616755

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;