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

Commit fc604b04 authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Automerger Merge Worker
Browse files

Merge "Avoid collect window token which should be rotate independently" into... 

Merge "Avoid collect window token which should be rotate independently" into tm-qpr-dev am: 24737bd8 am: 6d72029b

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



Change-Id: I94fbb686470fa35f8a532ff53abb794f124746d9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dfbbf201 6d72029b

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -479,9 +479,10 @@ class TransitionController { 
        // Collect all visible non-app windows which need to be drawn before the animation starts.

        // Collect all visible non-app windows which need to be drawn before the animation starts.

        final DisplayContent dc = wc.asDisplayContent();

        final DisplayContent dc = wc.asDisplayContent();

        if (dc != null) {

        if (dc != null) {

            final boolean noAsyncRotation = dc.getAsyncRotationController() == null;

            wc.forAllWindows(w -> {

            wc.forAllWindows(w -> {

                if (w.mActivityRecord == null && w.isVisible() && !isCollecting(w.mToken)

                if (w.mActivityRecord == null && w.isVisible() && !isCollecting(w.mToken)

                        && dc.shouldSyncRotationChange(w)) {

                        && (noAsyncRotation || !AsyncRotationController.canBeAsync(w.mToken))) {

                    transition.collect(w.mToken);

                    transition.collect(w.mToken);

                }

                }

            }, true /* traverseTopToBottom */);

            }, true /* traverseTopToBottom */);