From 4a7bb14cd52ddff27e17365b94013deafc63fd61 Mon Sep 17 00:00:00 2001 From: Simon Bowden Date: Mon, 15 Nov 2021 12:32:55 +0000 Subject: [PATCH] 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 --- services/core/java/com/android/server/am/ProcessList.java | 3 +-- 1 file changed, 1 insertion(+), 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 0df19ba43e4e4..ca32e08dcddee 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);