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

Commit 3b5c0c54 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of [15415825, 15422591] into sc-release 

Change-Id: I3a4a5171a8f91a0e953ad8cf06130c2808322f9b
parents bd7a5bbf 58f1264e

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

+3 −0
Original line number Diff line number Diff line
@@ -365,6 +365,9 @@ public final class PhantomProcessList { 
    private int onPhantomProcessFdEvent(FileDescriptor fd, int events) {

        synchronized (mLock) {

            final PhantomProcessRecord proc = mPhantomProcessesPidFds.get(fd.getInt$());

            if (proc == null) {

                return 0;

            }

            if ((events & EVENT_INPUT) != 0) {

                proc.onProcDied(true);

            } else {