Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove TaskFragment Shell transition collection when startActivity" into tm-qpr-dev am: bccd7f9dce

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20419286

Change-Id: Idf8a3eed89b76e4e052c8fb4410b56a15de23fa1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-11-22 04:17:07 +00:00
committed by Automerger Merge Worker
parent 1992dff065 bccd7f9dce
commit 480d734cee
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/wm/ActivityStarter.java
View File

@@ -2760,12 +2760,6 @@ class ActivityStarter {
newParent = candidateTf; 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 if (mStartActivity.getTaskFragment() == null
|| mStartActivity.getTaskFragment() == newParent) { || mStartActivity.getTaskFragment() == newParent) {
newParent.addChild(mStartActivity, POSITION_TOP); newParent.addChild(mStartActivity, POSITION_TOP);