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

Commit 706c4bcf authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge "Clean up stale fixed rotation state" into udc-qpr-dev

parents 45300425 e1fd49b5

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