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

Commit 16138208 authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Android (Google) Code Review
Browse files

Merge "Fixes rotation stuck in core without trigger transition."

parents f4513cdf a6ff530c

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

+2 −2
Original line number Diff line number Diff line
@@ -508,10 +508,10 @@ public class DisplayRotation { 
        mDisplayContent.setLayoutNeeded();



        if (useShellTransitions) {

            final boolean wasInTransition = mDisplayContent.inTransition();

            final boolean wasCollecting = mDisplayContent.mTransitionController.isCollecting();

            mDisplayContent.requestChangeTransitionIfNeeded(

                    ActivityInfo.CONFIG_WINDOW_CONFIGURATION);

            if (wasInTransition) {

            if (wasCollecting) {

                // Use remote-rotation infra since the transition has already been requested

                // TODO(shell-transitions): Remove this once lifecycle management can cover all

                //                          rotation cases.