Merge "Fix NullPointerException in PhantomProcessList due to race condition" into sc-dev

2021-07-29 08:19:11 +00:00
parent fda724a5be 0a05f5475f
commit 8b872f5c71
1 changed files with 3 additions and 0 deletions
--- a/services/core/java/com/android/server/am/PhantomProcessList.java
+++ b/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 {