commit 52cf99867c8c06115613708c30be5722ce499467
author Keun-young Park <keunyoung@google.com> Thu Mar 30 04:19:35 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Mar 30 04:19:35 2017 +0000
tree 4e953b2acf4430b15d6d1929e6a207478106e263
parent 6fae0a3f181c5c154727582cf85a6146770f8562
parent a9b5e48b57ccabd83d7662e5e763f76552b68888

Merge "send SIGTERM only once" am: 9ead7c4a74 am: ba54f32b0a
am: 72d44ae00c

Change-Id: I31b6064ae5625a1f6cd1b34c57085a18d870be27

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