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

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

Merge "Have init kill the process group." am: 9a5300fc 

am: 963de553

Change-Id: Ic1a03c113d4615d793dae7b4273deb37a956fd5c
parents f8e59569 963de553

init/service.cpp

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

}





void Service::KillProcessGroup(int signal) {

void Service::KillProcessGroup(int signal) {

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

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

              << " to service '" << name_

              << " to service '" << name_

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

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

    kill(pid_, signal);

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

    killProcessGroup(uid_, pid_, signal);

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

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