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

Commit 73cdce53 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "DesktopMixed: check we have no valid changes if launch change is null" into main

parents 708ed870 59dfd3cd
Loading
Loading
Loading
Loading
+7 −5
Original line number Diff line number Diff line
@@ -205,11 +205,6 @@ class DesktopMixedTransitionHandler(
        finishTransaction: SurfaceControl.Transaction,
        finishCallback: TransitionFinishCallback,
    ): Boolean {
        val launchChange = findDesktopTaskChange(info, pending.launchingTask)
        if (launchChange == null) {
            logV("No launch Change, returning")
            return false
        }
        // Check if there's also an immersive change during this launch.
        val immersiveExitChange = pending.exitingImmersiveTask?.let { exitingTask ->
            findDesktopTaskChange(info, exitingTask)
@@ -217,6 +212,13 @@ class DesktopMixedTransitionHandler(
        val minimizeChange = pending.minimizingTask?.let { minimizingTask ->
            findDesktopTaskChange(info, minimizingTask)
        }
        val launchChange = findDesktopTaskChange(info, pending.launchingTask)
        if (launchChange == null) {
            check(minimizeChange == null)
            check(immersiveExitChange == null)
            logV("No launch Change, returning")
            return false
        }

        var subAnimationCount = -1
        var combinedWct: WindowContainerTransaction? = null