From e2c24bb69eec27808d1f1ca506d49a6cb55ac8c2 Mon Sep 17 00:00:00 2001
From: Jeff Chang <chengjeff@google.com>
Date: Mon, 27 Sep 2021 18:58:34 +0800
Subject: [PATCH] Do not add the finishing Activity to mNoHistoryActivities

The resumed activity is added to mNoHistoryActiviyies while start
pausing the currently resumed activity. The activity in pending
finish state should be ignored while pausing the activity.

Bug: 200159293
Test: atest ActivityStarterTests
Change-Id: I396b115d340916c5a89019fa9f2cd250bfaee0f8
---
 services/core/java/com/android/server/wm/TaskFragment.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/TaskFragment.java b/services/core/java/com/android/server/wm/TaskFragment.java
index 277c33be1a0e6..ba220c6727d57 100644
--- a/services/core/java/com/android/server/wm/TaskFragment.java
+++ b/services/core/java/com/android/server/wm/TaskFragment.java
@@ -1387,7 +1387,8 @@ class TaskFragment extends WindowContainer<WindowContainer> {
         ProtoLog.v(WM_DEBUG_STATES, "Moving to PAUSING: %s", prev);
         mPausingActivity = prev;
         mLastPausedActivity = prev;
-        if (prev.isNoHistory() && !mTaskSupervisor.mNoHistoryActivities.contains(prev)) {
+        if (!prev.finishing && prev.isNoHistory()
+                && !mTaskSupervisor.mNoHistoryActivities.contains(prev)) {
             mTaskSupervisor.mNoHistoryActivities.add(prev);
         }
         prev.setState(PAUSING, "startPausingLocked");