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

Merge "Use killProcessGroup when killing app zygote." into rvc-dev am: 0a8ef2b45f am: f1e067d713 am: f869b24229

Browse Source 
Original change: undetermined

Change-Id: I9b358fd9f6050c3e4ec74048d4c783d7b9bf1c9e
This commit is contained in:
Martijn Coenen
2020-06-02 07:39:47 +00:00
committed by Automerger Merge Worker
parent 3d5f350c91 f869b24229
commit 4c8aee3353
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/os/AppZygote.java
View File

@@ -92,10 +92,9 @@ public class AppZygote {
@GuardedBy("mLock") @GuardedBy("mLock")
private void stopZygoteLocked() { private void stopZygoteLocked() {
if (mZygote != null) { if (mZygote != null) {
// Close the connection and kill the zygote process. This will not cause
// child processes to be killed by itself.
mZygote.close(); mZygote.close();
Process.killProcess(mZygote.getPid()); // use killProcessGroup() here, so we kill all untracked children as well.
Process.killProcessGroup(mZygoteUid, mZygote.getPid());
mZygote = null; mZygote = null;
} }
} }