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

Commit ef439db2 authored by Daichi Hirono's avatar Daichi Hirono
Browse files

Log focused tasks when skipping display change 

When skipping moving a desktop task to the next display because
the target display has focused non-desktop tasks, log the names
of those tasks to aid in debugging.

Test: DesktopTasksControllerTest
Test: WMShellSmokeTestsDesktopMode
Flag: com.android.window.flags.enable_move_to_next_display_shortcut
Change-Id: Ia1e3089c43a2c900e4b85affa2e95b9506e61e9e
parent 597d8b1a

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

+7 −7
Original line number Diff line number Diff line
@@ -1024,9 +1024,8 @@ class DesktopTasksController( 
        val excludedTasks =

            getFocusedNonDesktopTasks(DEFAULT_DISPLAY, userId).map { task -> task.taskId }

        // Preserve focus state on reconnect, regardless if focused task is restored or not.

        val globallyFocusedTask = shellTaskOrganizer.getRunningTaskInfo(

            focusTransitionObserver.globallyFocusedTaskId

        )

        val globallyFocusedTask =

            shellTaskOrganizer.getRunningTaskInfo(focusTransitionObserver.globallyFocusedTaskId)

        mainScope.launch {

            preservedTaskIdsByDeskId.forEach { (preservedDeskId, preservedTaskIds) ->

                val newDeskId =
@@ -2339,10 +2338,11 @@ class DesktopTasksController( 
                )

                return@moveToNextDisplay false

            }

            if (!getFocusedNonDesktopTasks(displayId, userId).isEmpty()) {

            val focusedNonDesktopTasks = getFocusedNonDesktopTasks(displayId, userId)

            if (!focusedNonDesktopTasks.isEmpty()) {

                logD(

                    "moveToNextDesktopDisplay: Skip displayId=$displayId as the focused " +

                        "task is not desktop task focused non desktop tasks."

                    "moveToNextDesktopDisplay: Skip displayId=$displayId as it has focused " +

                        "non desktop tasks ${focusedNonDesktopTasks.joinToString()}"

                )

                return@moveToNextDisplay false

            }