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

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

Merge "Preserve rotation transform if the app is in a playing transition" into main

parents e936ed60 4f92cee6

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

+1 −0
Original line number Diff line number Diff line
@@ -2913,6 +2913,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
        // contains another opaque activity.

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

                && !mTransitionController.isCollecting()

                && !mTransitionController.isPlayingTarget(mFixedRotationLaunchingApp)

                && !mAtmService.mBackNavigationController.isMonitoringFinishTransition()) {

            final Transition finishTransition = mTransitionController.mFinishingTransition;

            if (finishTransition == null || !finishTransition.mParticipants.contains(