commit 7af91b9867ebc5f0606117ffd5f2432eb711b00e
author Mark Salyzyn <salyzyn@google.com> Wed Sep 27 19:45:01 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Sep 27 19:45:01 2017 +0000
tree 2ba633139cc2a33f1b961b40e1f9231bc59b3429
parent 630712beb21d10eabf6252cedb7279d1511c9451
parent e688a81789d209c4118178dc4472a7838e95d11c

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

Change-Id: I3978179b92f096e3a951463dbe850a94a77ba27a

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