Merge "Fix NullPointerException in PhantomProcessList due to race condition" into sc-dev am: 8b872f5c71

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

Change-Id: Idfd608961cd3191554f6c62ab13f6e0a2d75079f

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

@@ -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 {