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

Commit 02bb97ba 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 

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



Change-Id: I6bb45d4c830c8631448fa844ada36891c8b333f3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ead6f9e2 706c4bcf

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

+4 −0
Original line number Diff line number Diff line
@@ -2751,6 +2751,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