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

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

Merge "Keep display orientation if top rotated app is in transition" into main

parents 067d8962 eb312265

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

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

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

                && !mTransitionController.isCollecting()

                && !mTransitionController.isPlayingTarget(mFixedRotationLaunchingApp)

                && !mTransitionController.inPlayingTransition(mFixedRotationLaunchingApp)

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

            final Transition finishTransition = mTransitionController.mFinishingTransition;

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