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

Commit 25964c7f 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 

am: a81e2272

Change-Id: Ie1a696d1b747cf90cb7f300bb2af454c10659ba5
parents 294a3e42 a81e2272

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