commit 59f22f21b479acb5a21ac0af79fbb24d1ffa5a4e
author Bertrand SIMONNET <bsimonnet@google.com> Fri Dec 18 11:40:51 2015 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 08 19:27:35 2016 +0000
tree cb667c6a20edb39dfb93187c55d016898e0a3bef
parent fe2b200059c178c8e7a3782eab06e42ad022e002

Set the default shutdown timeout to 5s.

When shutting down, allow services to exit cleanly by sending them a
SIGTERM signal and waiting 5 seconds before rebooting.

Bug: 26216447
Test: manual: `power_example --action=shut_down`. All services exit
cleanly then the system reboots.

Change-Id: I4c1c0e42ce9d0ca86381c790f2d28d22f2bb06e9

brillo_base.mk

diff --git a/brillo_base.mk b/brillo_base.mk
index 5a28fdf..94d21ab 100644
--- a/brillo_base.mk
+++ b/brillo_base.mk
@@ -328,7 +328,8 @@
 # On Android this is defined in embedded.mk, see
 # https://android-review.googlesource.com/#/c/106470.
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
-    debug.atrace.tags.enableflags=0
+    debug.atrace.tags.enableflags=0 \
+    ro.build.shutdown_timeout=5 \
 
 # Define a make variable that identifies Brillo targets.
 BRILLO := 1