From c46f75ef1d479f7b606ab04283b1b0f84849476a Mon Sep 17 00:00:00 2001 From: Narayan Kamath Date: Wed, 10 Dec 2014 10:00:14 +0000 Subject: Avoid tearing down process groups twice. The second removal always triggers a warning. Change-Id: Ieafa8374dbffdaff0d576de004a688cae6f8ac18 --- .../core/java/com/android/server/am/ActivityManagerService.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 79f2e7c1c0f4..e3f7fb3c9120 100755 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -4874,9 +4874,11 @@ public final class ActivityManagerService extends ActivityManagerNative 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 && -- cgit v1.2.3