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

Commit 58f1264e authored by Jing Ji's avatar Jing Ji Committed by Android Build Coastguard Worker
Browse files

Fix NullPointerException in PhantomProcessList due to race condition 

Bug: 194897294
Bug: 194146206
Test: atest AppChildProcessTest
Test: atest CtsAppTestCases:ActivityManagerTest
Change-Id: I5d395726d2ff404e8e82d21a7886511a06288c43
(cherry picked from commit 0a05f547)
parent bd7a5bbf

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

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

    private int onPhantomProcessFdEvent(FileDescriptor fd, int events) {

        synchronized (mLock) {

        synchronized (mLock) {

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

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

            if (proc == null) {

                return 0;

            }

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

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

                proc.onProcDied(true);

                proc.onProcDied(true);

            } else {

            } else {