From 5082dcb7fd5832181620cd69173fcd320043a2db Mon Sep 17 00:00:00 2001
From: Louis Chang <louischang@google.com>
Date: Tue, 24 Aug 2021 11:46:07 +0800
Subject: [PATCH] Reset the last-activity-removal of the adjacent TaskFragment

Nees to reset both of the two TaskFragments.

Bug: 189386466
Test: wm presubmit
Change-Id: I423053b4b9df27ad4787771d59d2c8d26586b5f3
---
 services/core/java/com/android/server/wm/TaskFragment.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/core/java/com/android/server/wm/TaskFragment.java b/services/core/java/com/android/server/wm/TaskFragment.java
index 6e4792bdbd31a..0b9d3dc9d0432 100644
--- a/services/core/java/com/android/server/wm/TaskFragment.java
+++ b/services/core/java/com/android/server/wm/TaskFragment.java
@@ -324,6 +324,7 @@ class TaskFragment extends WindowContainer<WindowContainer> {
         // Reset the adjacent TaskFragment if its adjacent TaskFragment is also this TaskFragment.
         if (mAdjacentTaskFragment != null && mAdjacentTaskFragment.mAdjacentTaskFragment == this) {
             mAdjacentTaskFragment.mAdjacentTaskFragment = null;
+            mAdjacentTaskFragment.mDelayLastActivityRemoval = false;
         }
         mAdjacentTaskFragment = null;
         mDelayLastActivityRemoval = false;