ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
am: d2b5a2417f

Change-Id: Ifb4ab5fa166ee055838c5ad52d69e0d0c07c7e59
This commit is contained in:
Mark Salyzyn 2017-09-27 19:40:16 +00:00 • committed by android-build-merger
commit 387dbf9ab0
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bootstat/bootstat.cpp
View file

@ -204,6 +204,7 @@ const std::map<std::string, int32_t> kBootReasonMap = {
{"reboot,shell", 66}, {"reboot,shell", 66},
{"reboot,adb", 67}, {"reboot,adb", 67},
{"reboot,userrequested", 68}, {"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 // Converts a string value representing the reason the system booted to an

3
init/init.cpp
View file

@ -417,8 +417,7 @@ static void HandleSigtermSignal() {
return; return;
} }
LOG(INFO) << "Handling SIGTERM, shutting system down"; HandlePowerctlMessage("shutdown,container");
HandlePowerctlMessage("shutdown");
} }
static void InstallSigtermHandler() { static void InstallSigtermHandler() {