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

Commit ba54f32b authored by Keun-young Park's avatar Keun-young Park Committed by android-build-merger
Browse files

Merge "send SIGTERM only once" 

am: 9ead7c4a

Change-Id: I87ac8e4402207719dd6cebb05adc0a3e1c2afbfe
parents d140cc9b 9ead7c4a

init/service.cpp

+7 −1
Original line number Diff line number Diff line
@@ -211,7 +211,13 @@ void Service::KillProcessGroup(int signal) { 
    LOG(INFO) << "Sending signal " << signal

              << " to service '" << name_

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

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

    int r;

    if (signal == SIGTERM) {

        r = killProcessGroupOnce(uid_, pid_, signal);

    } else {

        r = killProcessGroup(uid_, pid_, signal);

    }

    if (r == -1) {

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

    }

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