diff options
| author | Narayan Kamath <narayan@google.com> | 2014-12-11 09:08:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-11 09:08:43 +0000 |
| commit | 15cd63027bc8413659114714068a665869a4b3b2 (patch) | |
| tree | 0e0a0b71789bfac947cd486a3914820c4fc3f667 /services | |
| parent | 2122e14cca3edc5099b90d8768b34d7a0e9fe148 (diff) | |
| parent | 034ef013ecb14203a005f88abb1c765055b7d4f4 (diff) | |
| download | frameworks_base-15cd63027bc8413659114714068a665869a4b3b2.zip frameworks_base-15cd63027bc8413659114714068a665869a4b3b2.tar.gz frameworks_base-15cd63027bc8413659114714068a665869a4b3b2.tar.bz2 | |
Merge "Avoid tearing down process groups twice." into lmp-mr1-dev
Diffstat (limited to 'services')
| -rwxr-xr-x | services/core/java/com/android/server/am/ActivityManagerService.java | 8 |
1 files 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 844980b..c0fc890 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 @@ 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 && |