From 7feab6823885cb591f9239e01235d2ed529f2b69 Mon Sep 17 00:00:00 2001
From: Keun-young Park <keunyoung@google.com>
Date: Wed, 26 Apr 2017 12:36:14 -0700
Subject: [PATCH] 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
Change-Id: I9a805ddfde8156b066485902048d0cd01365c453
---
 init/reboot.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/init/reboot.cpp b/init/reboot.cpp
index 395d21b65..172fc77c9 100644
--- a/init/reboot.cpp
+++ b/init/reboot.cpp
@@ -318,8 +318,7 @@ void DoReboot(unsigned int cmd, const std::string& reason, const std::string& re
         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;