Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a81e2272 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

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

am: 387dbf9a

Change-Id: I3978179b92f096e3a951463dbe850a94a77ba27a
parents e8526de6 387dbf9a

bootstat/bootstat.cpp

+1 −0
Original line number Diff line number Diff line
@@ -204,6 +204,7 @@ const std::map<std::string, int32_t> kBootReasonMap = { 
    {"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

+1 −2
Original line number Diff line number Diff line
@@ -417,8 +417,7 @@ static void HandleSigtermSignal() { 
        return;

    }



    LOG(INFO) << "Handling SIGTERM, shutting system down";

    HandlePowerctlMessage("shutdown");

    HandlePowerctlMessage("shutdown,container");

}



static void InstallSigtermHandler() {