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

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

Merge "Don't include transient launches in visible-at-end tokens" into tm-qpr-dev am: 2673e8e9 

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



Change-Id: I7f63ddc8b9f8c20894fc71bdb37322de6d8097f6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2e4abb81 2673e8e9

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

+3 −0
Original line number Diff line number Diff line
@@ -712,6 +712,9 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe 
        for (int i = mParticipants.size() - 1; i >= 0; --i) {

            final WindowContainer wc = mParticipants.valueAt(i);

            if (wc.asWindowToken() == null || !wc.isVisibleRequested()) continue;

            // don't include transient launches, though, since those are only temporarily visible.

            if (mTransientLaunches != null && wc.asActivityRecord() != null

                    && mTransientLaunches.containsKey(wc.asActivityRecord())) continue;

            mVisibleAtTransitionEndTokens.add(wc.asWindowToken());

        }