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

Merge "Don't collect task on activity-start" into tm-qpr-dev

Browse Source
This commit is contained in:
Evan Rosky
2022-11-08 20:05:05 +00:00
committed by Android (Google) Code Review
parent c3322a827a 41de612358
commit e30befa00e
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);