commit c63821773237712c27f68a190aaf70cee60b0c25
author Tom Cherry <tomcherry@google.com> Thu Jun 15 17:30:23 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jun 15 17:30:23 2017 +0000
tree 2bf1f11f4815b41b92944bff363052f6be9f1658
parent 1c21d4bf8a5bb8ed3116aa92cbdcb68d6fdda74c
parent 24d0cad327919b4bee80bd0546975d8630ac18fd

Merge "Add getpgid to system_service and init" am: 2122f1fe95 am: 043068593a
am: 24d0cad327

Change-Id: Ieffac9d2e5ff8500534cf9935eff9918989c2fb4

private/system_server.te

diff --git a/private/system_server.te b/private/system_server.te
index 2bfd4cd..99dc663 100644
--- a/private/system_server.te
+++ b/private/system_server.te
@@ -99,7 +99,7 @@
 allow system_server self:netlink_route_socket nlmsg_write;
 
 # Kill apps.
-allow system_server appdomain:process { sigkill signal };
+allow system_server appdomain:process { getpgid sigkill signal };
 
 # Set scheduling info for apps.
 allow system_server appdomain:process { getsched setsched };

public/init.te

diff --git a/public/init.te b/public/init.te
index 8abad58..0e9c769 100644
--- a/public/init.te
+++ b/public/init.te
@@ -281,7 +281,7 @@
 
 # Support "adb shell stop"
 allow init self:capability kill;
-allow init domain:process { sigkill signal };
+allow init domain:process { getpgid sigkill signal };
 
 # Init creates keystore's directory on boot, and walks through
 # the directory as part of a recursive restorecon.