From 41de612358aed2e56bd12f467928148b26ffce7e Mon Sep 17 00:00:00 2001
From: Evan Rosky <erosky@google.com>
Date: Mon, 7 Nov 2022 19:17:01 -0800
Subject: [PATCH] Don't collect task on activity-start

Since the task is not changing, don't collect it.

Bug: b/258043830
Test: atest IncompleteMotionTest
Change-Id: I511a4adcbe8a3eca605a98a8b8ea090bd7e82c56
---
 .../core/java/com/android/server/wm/ActivityStarter.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java
index ed50c1e979add..dc69ca6bc0cfd 100644
--- a/services/core/java/com/android/server/wm/ActivityStarter.java
+++ b/services/core/java/com/android/server/wm/ActivityStarter.java
@@ -3037,7 +3037,12 @@ class ActivityStarter {
                 newParent = candidateTf;
             }
         }
-        newParent.mTransitionController.collect(newParent);
+        if (newParent.asTask() == null) {
+            // only collect task-fragments.
+            // TODO(b/258095975): we probably shouldn't ever collect the parent here since it isn't
+            //                    changing. The logic that changes it should collect it.
+            newParent.mTransitionController.collect(newParent);
+        }
         if (mStartActivity.getTaskFragment() == null
                 || mStartActivity.getTaskFragment() == newParent) {
             newParent.addChild(mStartActivity, POSITION_TOP);