Merge "Use killProcessGroup when killing app zygote." into qt-dev

2020-06-02 06:54:27 +00:00
parent 7974d15859 a15d846108
commit ff0af3d0c2
1 changed files with 2 additions and 3 deletions
--- 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;
        }
    }