From f21c81aa25c5c8273cde50275531d7edc2342c6f Mon Sep 17 00:00:00 2001 From: Chris Li Date: Wed, 9 Nov 2022 13:58:30 +0800 Subject: [PATCH] Remove TaskFragment Shell transition collection when startActivity The old logic was introduced when we were not sure when the TaskFragment may change during startActivity. After [1], we now collect TaskFragment when the organizer has requested to change it. Thus the old logic should not be needed anymore. [1]: d00861c46efc71ca6b1fe2bcb010b71b39b99085 Fix: 258095975 Test: verify the opening ActivityEmbedding split app has no flicker Change-Id: I3e139e216622ef6ffc5506b70e3962eb4a609dfb --- .../core/java/com/android/server/wm/ActivityStarter.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java index dc69ca6bc0cfd..bfb9fd3d467bb 100644 --- a/services/core/java/com/android/server/wm/ActivityStarter.java +++ b/services/core/java/com/android/server/wm/ActivityStarter.java @@ -3037,12 +3037,6 @@ class ActivityStarter { newParent = candidateTf; } } - 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);