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

Commit eb312265 authored by Riddle Hsu's avatar Riddle Hsu
Browse files

Keep display orientation if top rotated app is in transition 

The original check may miss the case that the task is transition
target but the activity is not. Otherwise when there is parallel
transitions, a finished activity transition will interrupt the
running transient transition by triggering display change.

Bug: 421042201
Flag: EXEMPT bugfix
Test: DisplayContentTests#testRespectNonTopVisibleFixedOrientation
Test: Enter recents from a task which contains 2 activities.
      And then the task's top activity calls finish.
      After the activity level close transition is done, the
      recents transition should be still active.
Change-Id: Ie06c1e89471435b8da1e2de0efc3915be5005bab
parent a08a0293

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

+1 −1
Original line number Diff line number Diff line
@@ -2893,7 +2893,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(