Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Avoid tearing down process groups twice." into lmp-mr1-dev

Browse Source
This commit is contained in:
Narayan Kamath
2014-12-11 09:08:38 +00:00
committed by Android (Google) Code Review
parent 2122e14cca 034ef013ec
commit 15cd63027b
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -4657,9 +4657,11 @@ public final class ActivityManagerService extends ActivityManagerNative
stats.noteProcessDiedLocked(app.info.uid, pid); stats.noteProcessDiedLocked(app.info.uid, pid);
} }
Process.killProcessQuiet(pid); if (!app.killed) {
Process.killProcessGroup(app.info.uid, pid); Process.killProcessQuiet(pid);
app.killed = true; Process.killProcessGroup(app.info.uid, pid);
app.killed = true;
}
// Clean up already done if the process has been re-started. // Clean up already done if the process has been re-started.
if (app.pid == pid && app.thread != null && if (app.pid == pid && app.thread != null &&