commit b8fd24763dbb8d0e08d08314607cbf75210d4f3a
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Apr 27 03:44:52 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 27 03:44:55 2017 +0000
tree 019d8433e05e52db83ccd03c25099a6d42f6ae50
parent 6120de8285186ba8f146de860720b1240152b20c
parent 1da0690f8352d5385bf04a6c7a98b0cb831c0f41

Merge "Revert "Remove capability setting for legacy_wifi_hal"" into oc-dev

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;