From 18ee2ee92ae1837bcbb1befad433eeeb622e4e6e Mon Sep 17 00:00:00 2001
From: Louis Chang <louischang@google.com>
Date: Fri, 11 Jun 2021 17:06:38 +0800
Subject: [PATCH] Avoid activity stopped when relaunching it to resumed

The activity could still in the stopping list while
relaunching it to resume state, which may cause the
activity to be stopped afterward.

Bug: 189413973
Test: wm presubmit
Change-Id: Ib77fe682f66504332fda82793b0d6e5a430f8c9d
---
 services/core/java/com/android/server/wm/ActivityRecord.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java
index 660cd37b123cb..45da45aafabaf 100644
--- a/services/core/java/com/android/server/wm/ActivityRecord.java
+++ b/services/core/java/com/android/server/wm/ActivityRecord.java
@@ -8086,6 +8086,9 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
             setState(PAUSED, "relaunchActivityLocked");
         }
 
+        // The activity may be waiting for stop, but that is no longer appropriate for it.
+        mTaskSupervisor.mStoppingActivities.remove(this);
+
         configChangeFlags = 0;
         deferRelaunchUntilPaused = false;
         preserveWindowOnDeferredRelaunch = false;