Merge "Fixes unable to start recents activity" into sc-dev

1 files changed, 2 insertions, 1 deletions

diff --git a/services/core/java/com/android/server/wm/RecentsAnimation.java b/services/core/java/com/android/server/wm/RecentsAnimation.java
index 4f8ea1ac377a..869133ae948c 100644
--- a/services/core/java/com/android/server/wm/RecentsAnimation.java
+++ b/services/core/java/com/android/server/wm/RecentsAnimation.java
@@ -171,7 +171,8 @@ class RecentsAnimation implements RecentsAnimationCallbacks, OnRootTaskOrderChan
         final boolean hasExistingActivity = targetActivity != null;
         if (hasExistingActivity) {
             mRestoreTargetBehindRootTask = getRootTaskAbove(targetRootTask);
-            if (mRestoreTargetBehindRootTask == null) {
+            if (mRestoreTargetBehindRootTask == null
+                    && targetRootTask.getTopMostTask() == targetActivity.getTask()) {
                 notifyAnimationCancelBeforeStart(recentsAnimationRunner);
                 ProtoLog.d(WM_DEBUG_RECENTS_ANIMATIONS,
                         "No root task above target root task=%s", targetRootTask);