Revert "Fix race conditions in removing dying process record"

This reverts commit b22de4e632784b339c8eafd4298deee57e8c7be8.

Reason for revert: Breaks com.android.devicehealthchecks.SystemAppCheck#system_app_anr, see b/206336727

Change-Id: I080deb09582c8479b78f5c8a1d1ac07c4e0cdf12

1 files changed, 1 insertions, 2 deletions

diff --git a/services/core/java/com/android/server/am/ProcessList.java b/services/core/java/com/android/server/am/ProcessList.java
index 0df19ba43e4e..ca32e08dcdde 100644
--- a/services/core/java/com/android/server/am/ProcessList.java
+++ b/services/core/java/com/android/server/am/ProcessList.java
@@ -5143,8 +5143,7 @@ public final class ProcessList {
         }
 
         Watchdog.getInstance().processDied(app.processName, app.getPid());
-        if (app.getDeathRecipient() == null
-                && mDyingProcesses.get(app.processName, app.uid) == app) {
+        if (app.getDeathRecipient() == null) {
             // If we've done unlinkDeathRecipient before calling into this, remove from dying list.
             mDyingProcesses.remove(app.processName, app.uid);
             app.setDyingPid(0);