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

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

Browse Source 
* commit '314621287801ba4c71467aad4702114eeb4d9951':
  Avoid tearing down process groups twice.
This commit is contained in:
Narayan Kamath
2014-12-11 10:28:10 +00:00
committed by Android Git Automerger
parent 37da3f0d28 3146212878
commit bc59ca4bdb
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

@@ -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 &&