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

Commit 17a45e2a authored by Cosmin Băieș's avatar Cosmin Băieș Committed by Android (Google) Code Review
Browse files

Merge "Consider transient-launch in waiting transitions" into main

parents 365ec196 80817dd4

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

+3 −0
Original line number Diff line number Diff line
@@ -565,6 +565,9 @@ class TransitionController { 
        if (isTransientCollect(ar)) {

            return true;

        }

        for (int i = mWaitingTransitions.size() - 1; i >= 0; --i) {

            if (mWaitingTransitions.get(i).isTransientLaunch(ar)) return true;

        }

        for (int i = mPlayingTransitions.size() - 1; i >= 0; --i) {

            if (mPlayingTransitions.get(i).isTransientLaunch(ar)) return true;

        }

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

+1 −0
Original line number Diff line number Diff line
@@ -1630,6 +1630,7 @@ public class TransitionTests extends WindowTestsBase { 
        assertTrue(controller.mWaitingTransitions.contains(transition));

        assertTrue(controller.isTransientHide(appTask));

        assertTrue(controller.isTransientVisible(appTask));

        assertTrue(controller.isTransientLaunch(recent));

    }



    @Test