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

Commit 389399dd authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

Merge "Don't collect task on activity-start" into tm-qpr-dev am: e30befa0 am: 3ef452f4 

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



Change-Id: Ib4bec87d0ad64538bc524c404a7a528877288897
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5210b87c 3ef452f4

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

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