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

Browse Source
This commit is contained in:
TreeHugger Robot
2022-11-22 03:54:33 +00:00
committed by Android (Google) Code Review
parent fc0ce8aa00 f21c81aa25
commit bccd7f9dce
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

@@ -3037,12 +3037,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);