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

Commit 00d83799 authored by Jorge Gil's avatar Jorge Gil
Browse files

Handle the case where transition may have empty immersive change 

During an exit, the transition may end up not containing the immersive
change if it was picked up by an earlier transition, such as when
entering PIP. In those case, do not require that the immersive task be
present or a crash may occur.

Fix: 377607197
Flag: com.android.window.flags.enable_fully_immersive_in_desktop
Test: enter/exit fullscreen immersive with Neftlix multiple times
Change-Id: I0a60bd25484f44f75d54a3b7ab789596511cd890
parent 040ca8f9

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopImmersiveController.kt

+11 −2
Original line number Diff line number Diff line
@@ -374,8 +374,17 @@ class DesktopImmersiveController( 
        // Check if this is a direct immersive enter/exit transition.

        if (transition == state?.transition) {

            val state = requireState()

            val startBounds = info.changes.first { c -> c.taskInfo?.taskId == state.taskId }

                .startAbsBounds

            val immersiveChange = info.changes.firstOrNull { c ->

                c.taskInfo?.taskId == state.taskId

            }

            if (immersiveChange == null) {

                logV(

                    "Direct move for task#%d in %s direction missing immersive change.",

                    state.taskId, state.direction

                )

                return

            }

            val startBounds = immersiveChange.startAbsBounds

            logV("Direct move for task#%d in %s direction verified", state.taskId, state.direction)

            when (state.direction) {

                Direction.ENTER -> {