commit 25964c7fd83c8ceaa09cf41688a3a2544e2a3fe8
author Mark Salyzyn <salyzyn@google.com> Wed Sep 27 19:48:05 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Sep 27 19:48:05 2017 +0000
tree 5c7edd78be289545889138a3fed0f8bac2c5bd52
parent 294a3e42f4d225ce1707dcec1367d122b4a55114
parent a81e22728470599d4ec87e4175a02f9543b37ba1

Merge "init: report shutdown,container for sigterm of init" am: d2b5a2417f am: 387dbf9ab0
am: a81e227284

Change-Id: Ie1a696d1b747cf90cb7f300bb2af454c10659ba5

bootstat/bootstat.cpp

diff --git a/bootstat/bootstat.cpp b/bootstat/bootstat.cpp
index 7c0b15e..17986b9 100644
--- a/bootstat/bootstat.cpp
+++ b/bootstat/bootstat.cpp
@@ -204,6 +204,7 @@
     {"reboot,shell", 66},
     {"reboot,adb", 67},
     {"reboot,userrequested", 68},
+    {"shutdown,container", 69},  // Host OS asking Android Container to shutdown
 };
 
 // Converts a string value representing the reason the system booted to an

init/init.cpp

diff --git a/init/init.cpp b/init/init.cpp
index e611f18..ad045b1 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -417,8 +417,7 @@
         return;
     }
 
-    LOG(INFO) << "Handling SIGTERM, shutting system down";
-    HandlePowerctlMessage("shutdown");
+    HandlePowerctlMessage("shutdown,container");
 }
 
 static void InstallSigtermHandler() {