commit f65b0f62c0e9239d79b363f015e7cdf2d6b9f298
author Keun-young Park <keunyoung@google.com> Thu Mar 30 04:15:04 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Mar 30 04:15:04 2017 +0000
tree 0bd46867684b2e11dba3a0deead18d7f623edaa1
parent a2841441f25753a7ab26551461061f38bb228cc5
parent 2f4361d0d35c09c000d60cf7219ff06428835c42

Merge "send SIGTERM only once"
am: 9ead7c4a74

Change-Id: I87ac8e4402207719dd6cebb05adc0a3e1c2afbfe

init/service.cpp

diff --git a/init/service.cpp b/init/service.cpp
index ede6364..3db34db 100644
--- a/init/service.cpp
+++ b/init/service.cpp
@@ -211,7 +211,13 @@
     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) {