commit c4ffa5c47d0ac84cae57337412c2459f2cb11da5
author Keun-young Park <keunyoung@google.com> Tue Mar 28 09:41:36 2017 -0700
committer Keun-young Park <keunyoung@google.com> Wed Mar 29 12:25:33 2017 -0700
tree 6ca1351a740a5d915e625f6d6d94ea4a9e7e6bc1
parent 8772b3686efad95dc53afca5004fcd62c2797638

set zero shutdown timeout for eng build

- still it will take time to kill services, < 3 secs in tested device.

bug: 36678028
Test: reboot
Change-Id: I3f3eb83aede8cd950da12e3fcc259eeaf8517c3b

init/reboot.cpp

diff --git a/init/reboot.cpp b/init/reboot.cpp
index 2844d78..e34abdb 100644
--- a/init/reboot.cpp
+++ b/init/reboot.cpp
@@ -341,7 +341,14 @@
     }
 
     /* TODO update default waiting time based on usage data */
-    unsigned int shutdownTimeout = android::base::GetUintProperty("ro.build.shutdown_timeout", 10u);
+    constexpr unsigned int shutdownTimeoutDefault = 10;
+    unsigned int shutdownTimeout = shutdownTimeoutDefault;
+    if (SHUTDOWN_ZERO_TIMEOUT) {  // eng build
+        shutdownTimeout = 0;
+    } else {
+        shutdownTimeout =
+            android::base::GetUintProperty("ro.build.shutdown_timeout", shutdownTimeoutDefault);
+    }
     LOG(INFO) << "Shutdown timeout: " << shutdownTimeout;
 
     static const constexpr char* shutdown_critical_services[] = {"vold", "watchdogd"};