commit fbba3f411b2dcc8c3e1c5a3e7234b1243358b7ec
author Narayan Kamath <narayan@google.com> Thu Dec 11 10:39:09 2014 +0000
committer android-build-merger <android-build-merger@google.com> Thu Dec 11 10:39:09 2014 +0000
tree 885c26c35fde34b4864b0274c9a7de5d83533b71
parent 5e41c668810ee0b830cf3c355a09481fbcaeb2ca
parent 06024047258b01ad70f7d88e5773d8dc9b8d59fd

am bc59ca4b: am 31462128: Merge "Avoid tearing down process groups twice."
automerge: 0602404

* commit '06024047258b01ad70f7d88e5773d8dc9b8d59fd':
  Avoid tearing down process groups twice.

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

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 324bf7c..b93ea81 100755
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -4657,9 +4657,11 @@
             stats.noteProcessDiedLocked(app.info.uid, pid);
         }
 
-        Process.killProcessQuiet(pid);
-        Process.killProcessGroup(app.info.uid, pid);
-        app.killed = true;
+        if (!app.killed) {
+            Process.killProcessQuiet(pid);
+            Process.killProcessGroup(app.info.uid, pid);
+            app.killed = true;
+        }
 
         // Clean up already done if the process has been re-started.
         if (app.pid == pid && app.thread != null &&