commit 0afcfdca963f4cefcb90ac7061aafe3985875145
author Nick Kralevich <nnk@google.com> Mon Nov 09 20:40:22 2015 +0000
committer android-build-merger <android-build-merger@google.com> Mon Nov 09 20:40:22 2015 +0000
tree 27e12e17239fa960ee7ddb7967edf31666379281
parent 2f40db7357edfc0ccd7753a53b470a161dfebbf2
parent 7907271af1f9024b1c5896a2d5006f7c868c771c

Merge "system_server: allow /proc read access to other UIDs" am: 51b48b3877 am: 02cc328d9d
am: 7907271af1

* commit '7907271af1f9024b1c5896a2d5006f7c868c771c':
  system_server: allow /proc read access to other UIDs

core/java/com/android/internal/os/ZygoteInit.java

diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java
index 9a5cde6..f78d8d8 100644
--- a/core/java/com/android/internal/os/ZygoteInit.java
+++ b/core/java/com/android/internal/os/ZygoteInit.java
@@ -523,7 +523,7 @@
         String args[] = {
             "--setuid=1000",
             "--setgid=1000",
-            "--setgroups=1001,1002,1003,1004,1005,1006,1007,1008,1009,1010,1018,1021,1032,3001,3002,3003,3006,3007",
+            "--setgroups=1001,1002,1003,1004,1005,1006,1007,1008,1009,1010,1018,1021,1032,3001,3002,3003,3006,3007,3009",
             "--capabilities=" + capabilities + "," + capabilities,
             "--nice-name=system_server",
             "--runtime-args",