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

Avoid tearing down process groups twice.

Browse Source 
The second removal always triggers a warning.

Change-Id: Ieafa8374dbffdaff0d576de004a688cae6f8ac18
This commit is contained in:
Narayan Kamath
2014-12-10 10:00:14 +00:00
committed by Dianne Hackborn
parent 5a267e72b2
commit 034ef013ec
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

@@ -4655,9 +4655,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 &&