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

Commit 963de553 authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

Merge "Have init kill the process group." 

am: 9a5300fc

Change-Id: I692c5fabfaea39e7ed6c9de5f6ad245330e3442c
parents 5c72c968 9a5300fc

init/service.cpp

+9 −5
Original line number Diff line number Diff line
@@ -197,11 +197,15 @@ void Service::NotifyStateChange(const std::string& new_state) const { 
}



void Service::KillProcessGroup(int signal) {

    LOG(VERBOSE) << "Sending signal " << signal

    LOG(INFO) << "Sending signal " << signal

              << " to service '" << name_

                 << "' (pid " << pid_ << ") process group...\n",

    kill(pid_, signal);

    killProcessGroup(uid_, pid_, signal);

              << "' (pid " << pid_ << ") process group...";

    if (killProcessGroup(uid_, pid_, signal) == -1) {

        PLOG(ERROR) << "killProcessGroup(" << uid_ << ", " << pid_ << ", " << signal << ") failed";

    }

    if (kill(-pid_, signal) == -1) {

        PLOG(ERROR) << "kill(" << pid_ << ", " << signal << ") failed";

    }

}



void Service::CreateSockets(const std::string& context) {