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

Commit c16ba976 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Don't kill subcontext if it's null" am: 932e069f am: 592de2a3 am:... 

Merge "Don't kill subcontext if it's null" am: 932e069f am: 592de2a3 am: e7fbb184 am: a8dd7ba8 am: fda68f23

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2146830



Change-Id: I1667042664a84823ecadd01edb6312771ed04c43
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 578aaf2d fda68f23

init/subcontext.cpp

+3 −0
Original line number Diff line number Diff line
@@ -381,6 +381,9 @@ bool SubcontextChildReap(pid_t pid) { 
}



void SubcontextTerminate() {

    if (!subcontext) {

        return;

    }

    subcontext_terminated_by_shutdown = true;

    kill(subcontext->pid(), SIGTERM);

}