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

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

Merge "send SIGTERM only once" am: 9ead7c4a am: ba54f32b 

am: 72d44ae0

Change-Id: I31b6064ae5625a1f6cd1b34c57085a18d870be27
parents 60ffe054 72d44ae0

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