commit 8cb357ea50f993c3a61a2aaf511c37a1d69b26a1
author Colin Cross <ccross@android.com> Mon Jul 14 01:56:59 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jul 14 01:56:59 2014 +0000
tree f5218f01fcb280143009772c4e07574cd3e14484
parent 350a68bf24ade269acc4ee69b0af01b9533f8187
parent 420f0a2567e8697b828e59802f972382360e667d

am 420f0a25: Merge "lmkd: use libprocessgroup to kill forked processes"

* commit '420f0a2567e8697b828e59802f972382360e667d':
  lmkd: use libprocessgroup to kill forked processes

lmkd/Android.mk

diff --git a/lmkd/Android.mk b/lmkd/Android.mk
index 2dd8af2..043a085 100644
--- a/lmkd/Android.mk
+++ b/lmkd/Android.mk
@@ -2,7 +2,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := lmkd.c
-LOCAL_SHARED_LIBRARIES := libcutils liblog libm libc
+LOCAL_SHARED_LIBRARIES := libcutils liblog libm libc libprocessgroup
 LOCAL_CFLAGS := -Werror
 
 LOCAL_MODULE := lmkd

lmkd/lmkd.c

diff --git a/lmkd/lmkd.c b/lmkd/lmkd.c
index 369b5ad..1aeb182 100644
--- a/lmkd/lmkd.c
+++ b/lmkd/lmkd.c
@@ -32,6 +32,7 @@
 
 #include <cutils/sockets.h>
 #include <log/log.h>
+#include <processgroup/processgroup.h>
 
 #ifndef __unused
 #define __unused __attribute__((__unused__))
@@ -591,6 +592,7 @@
                   other_file * page_k, minfree * page_k, min_score_adj,
                   other_free * page_k, other_free >= 0 ? "above" : "below");
             r = kill(pid, SIGKILL);
+            killProcessGroup(uid, pid, SIGKILL);
             pid_remove(pid);
 
             if (r) {