diff options
| author | Martijn Coenen <maco@google.com> | 2020-05-29 14:49:25 +0200 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-06-11 07:25:42 +0000 |
| commit | e7d357e89d57c6dabd6281bd95218f5677044dd6 (patch) | |
| tree | b677a675bafacb83559ef648847e248e592b310d | |
| parent | 59168ca75a2f45ad5fdb201f4003e1bd4a069180 (diff) | |
| download | base-e7d357e89d57c6dabd6281bd95218f5677044dd6.tar.gz | |
Use killProcessGroup when killing app zygote.
To make sure we kill all untracked children, too.
Bug: 156741968
Bug: 157598956
Test: manual inspection, PoC no longer works.
Change-Id: I5d8efeb05ddec08a7fc7c00eabca6590c4cfdd8c
(cherry picked from commit 0a91f61ac8387c02528e0f6f0948296ba9d5ca77)
| -rw-r--r-- | core/java/android/os/AppZygote.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/java/android/os/AppZygote.java b/core/java/android/os/AppZygote.java index 6daa5b4dc6d8..66f50e4b2610 100644 --- a/core/java/android/os/AppZygote.java +++ b/core/java/android/os/AppZygote.java @@ -90,10 +90,9 @@ public class AppZygote { @GuardedBy("mLock") private void stopZygoteLocked() { if (mZygote != null) { - // Close the connection and kill the zygote process. This will not cause - // child processes to be killed by itself. mZygote.close(); - Process.killProcess(mZygote.getPid()); + // use killProcessGroup() here, so we kill all untracked children as well. + Process.killProcessGroup(mZygoteUid, mZygote.getPid()); mZygote = null; } } |