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

Commit 46a529fd authored by Mateusz Cicheński's avatar Mateusz Cicheński Committed by Automerger Merge Worker
Browse files

Merge "Avoid collecting transient activity in next transition" into udc-dev... 

Merge "Avoid collecting transient activity in next transition" into udc-dev am: fb257a4c am: 8380501f

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



Change-Id: Ica31013864ceed5ebe1f61a3137c441cf48cc2a3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0c4cddfd 8380501f

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

+6 −5
Original line number Diff line number Diff line
@@ -918,6 +918,8 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { 
            final WindowContainer<?> participant = mParticipants.valueAt(i);

            final ActivityRecord ar = participant.asActivityRecord();

            if (ar != null) {

                final Task task = ar.getTask();

                if (task == null) continue;

                boolean visibleAtTransitionEnd = mVisibleAtTransitionEndTokens.contains(ar);

                // We need both the expected visibility AND current requested-visibility to be

                // false. If it is expected-visible but not currently visible, it means that
@@ -936,9 +938,7 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { 
                    if (commitVisibility) {

                        ProtoLog.v(ProtoLogGroup.WM_DEBUG_WINDOW_TRANSITIONS,

                                "  Commit activity becoming invisible: %s", ar);

                        final Task task = ar.getTask();

                        if (task != null && !task.isVisibleRequested()

                                && mTransientLaunches != null) {

                        if (mTransientLaunches != null && !task.isVisibleRequested()) {

                            // If transition is transient, then snapshots are taken at end of

                            // transition.

                            mController.mSnapshotController.mTaskSnapshotController
@@ -963,8 +963,9 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { 


                    // Since transient launches don't automatically take focus, make sure we

                    // synchronize focus since we committed to the launch.

                    if (ar.isTopRunningActivity()) {

                        ar.moveFocusableActivityToTop("transitionFinished");

                    if (!task.isFocused() && ar.isTopRunningActivity()) {

                        mController.mAtm.setLastResumedActivityUncheckLocked(ar,

                                "transitionFinished");

                    }

                }

                continue;