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

Commit 4181591e authored by T.J. Mercier's avatar T.J. Mercier Committed by Automerger Merge Worker
Browse files

Merge "Make sure we'll always kill process group" into main am: 2ff53e43 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2780968



Change-Id: I3cf8dfb7146203986436a79ad493f25c8072a6c5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5fe48781 2ff53e43

services/core/java/com/android/server/am/ProcessRecord.java

+2 −3
Original line number Diff line number Diff line
@@ -1241,11 +1241,10 @@ class ProcessRecord implements WindowProcessListener { 
            killProcessGroup = true;

        }

        if (killProcessGroup) {

            if (async) {

                ProcessList.killProcessGroup(uid, mPid);

            } else {

            if (!async) {

                Process.sendSignalToProcessGroup(uid, mPid, OsConstants.SIGKILL);

            }

            ProcessList.killProcessGroup(uid, mPid);

        }

    }