commit 822de0d90cb4d76d5a8bd655f3c9a94f9bc25d7a
author Chris Tate <ctate@android.com> Fri Mar 25 17:19:52 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 25 17:19:53 2016 +0000
tree a71dd2e6eecb27e2ff904b2c981962279f08e9c1
parent 35a568fde4d9158fca49af36d8f1b1456fd20169
parent e8741d23d2dd05c4cb3fed5ee6a4040ee96a60e3

Merge "*Always* kill the right uid's group" into nyc-dev

services/core/java/com/android/server/am/ProcessRecord.java

diff --git a/services/core/java/com/android/server/am/ProcessRecord.java b/services/core/java/com/android/server/am/ProcessRecord.java
index b4aa4cf..5407d28 100644
--- a/services/core/java/com/android/server/am/ProcessRecord.java
+++ b/services/core/java/com/android/server/am/ProcessRecord.java
@@ -558,7 +558,7 @@
             }
             EventLog.writeEvent(EventLogTags.AM_KILL, userId, pid, processName, setAdj, reason);
             Process.killProcessQuiet(pid);
-            Process.killProcessGroup(info.uid, pid);
+            Process.killProcessGroup(uid, pid);
             if (!persistent) {
                 killed = true;
                 killedByAm = true;