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

Commit d8e9b5ec authored by Jing Ji's avatar Jing Ji Committed by Automerger Merge Worker
Browse files

Merge "Fix potential FD leak with PhantomProcessRecord bookkeeping" into... 

Merge "Fix potential FD leak with PhantomProcessRecord bookkeeping" into sc-dev am: 5d411d76 am: e555eede

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

Change-Id: I4e2afec227e2ba867308e49a54b9aee27663b788
parents 92f5a640 e555eede

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -305,7 +305,7 @@ public final class PhantomProcessList { 
            }

            }

            // Somehow our record doesn't match, remove it anyway

            // Somehow our record doesn't match, remove it anyway

            Slog.w(TAG, "Stale " + proc + ", removing");

            Slog.w(TAG, "Stale " + proc + ", removing");

            mPhantomProcesses.removeAt(index);

            onPhantomProcessKilledLocked(proc);

        } else {

        } else {

            // Is this one of the zombie processes we've known?

            // Is this one of the zombie processes we've known?

            final int idx = mZombiePhantomProcesses.indexOfKey(pid);

            final int idx = mZombiePhantomProcesses.indexOfKey(pid);