Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41de6123 authored by Evan Rosky's avatar Evan Rosky
Browse files

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
parent a194e309

services/core/java/com/android/server/wm/ActivityStarter.java

+6 −1
Original line number Diff line number Diff line
@@ -3037,7 +3037,12 @@ 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);