commit 37ad148d7356db484b52648fea7df1e4128b811f
author Mark Salyzyn <salyzyn@google.com> Wed Sep 27 19:32:31 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 27 19:32:31 2017 +0000
tree c98af219819a5b8f3761fd05005ef191e06331ef
parent 765cc49b48c0473df39201f364e092a96e699d28
parent fc9b38d2f2960c535d2b62b6778b6638f4fe5a4d

Merge "init: report shutdown,container for sigterm of init"

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() {