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

Commit 2ed3f59c authored by Riddle Hsu's avatar Riddle Hsu
Browse files

Update display orientation if rotated app is not in transition 

It may happen when a translucent activity no longer affects display
orientation, e.g. enter pip, and the next fullscreen opaque activity
in the same task also declares fixed orientation.

Because the next activity is already visible, there won't be a
transition includes it, i.e. DC.FixedRotationTransitionListener#
onAppTransitionFinishedLocked won't be called to update orientation.
So handle the case when the previous transition is done, then the
display can follow the orientation request of the current top activity.

Fix: 384402546
Flag: EXEMPT bugfix
Test: DisplayContentTests#testRespectNonTopVisibleFixedOrientation
Change-Id: I4fce2f84254875d0b52252d428000d39f994f14b
parent c05c4e0e

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

+12 −0
Original line number Diff line number Diff line
@@ -2908,6 +2908,18 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
                && !mDisplayRotation.isRotatingSeamlessly()) {

            clearFixedRotationLaunchingApp();

        }

        // If there won't be a transition to notify the launch is done, then it should be ready to

        // update with display orientation. E.g. a translucent activity enters pip from a task which

        // contains another opaque activity.

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

                && !mTransitionController.isCollecting()

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

            final Transition finishTransition = mTransitionController.mFinishingTransition;

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

                    mFixedRotationLaunchingApp)) {

                continueUpdateOrientationForDiffOrienLaunchingApp();

            }

        }

    }



    /**

services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java

+5 −0
Original line number Diff line number Diff line
@@ -1863,6 +1863,11 @@ public class DisplayContentTests extends WindowTestsBase { 
        assertEquals("Display must be portrait after closing the translucent activity",

                Configuration.ORIENTATION_PORTRAIT,

                mDisplayContent.getConfiguration().orientation);



        mDisplayContent.setFixedRotationLaunchingAppUnchecked(nonTopVisible);

        mDisplayContent.onTransitionFinished();

        assertFalse("Complete fixed rotation if not in a transition",

                mDisplayContent.hasTopFixedRotationLaunchingApp());

    }



    @Test