Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1126e71 authored by Martijn Coenen's avatar Martijn Coenen Committed by android-build-team Robot
Browse files

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 0a91f61a)
parent c4d6e387

core/java/android/os/AppZygote.java

+2 −3
Original line number Diff line number Diff line
@@ -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;

        }

    }