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

Commit 79a3de34 authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Clean up stale fixed rotation state" into udc-qpr-dev am: 706c4bcf am: 02bb97ba 

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



Change-Id: I832f3fb182bcea85868596b22d15d7a0cc224889
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fb84e4ce 02bb97ba

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

+4 −0
Original line number Diff line number Diff line
@@ -2750,6 +2750,10 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
    void onAppTransitionDone() {

        super.onAppTransitionDone();

        mWmService.mWindowsChanged = true;

        onTransitionFinished();

    }



    void onTransitionFinished() {

        // If the transition finished callback cannot match the token for some reason, make sure the

        // rotated state is cleared if it is already invisible.

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

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

+1 −0
Original line number Diff line number Diff line
@@ -1328,6 +1328,7 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { 
            if (asyncRotationController != null && containsChangeFor(dc, mTargets)) {

                asyncRotationController.onTransitionFinished();

            }

            dc.onTransitionFinished();

            if (hasParticipatedDisplay && dc.mDisplayRotationCompatPolicy != null) {

                final ChangeInfo changeInfo = mChanges.get(dc);

                if (changeInfo != null