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

Commit 68c539bb authored by Gustav Sennton's avatar Gustav Sennton
Browse files

Fix some Desktop log statements 

Bug: 406870857
Flag: EXEMPT logging changes
Test: manual
Change-Id: I797af80f55f8b13cb0e88fa34eeeaca844f25273
parent ed71cd15

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

+1 −1
Original line number Diff line number Diff line
@@ -2061,7 +2061,7 @@ class DesktopTasksController( 
        val triggerTask = request.triggerTask

        // Skipping early if the trigger task is null

        if (triggerTask == null) {

            logV("skipping handleRequest reason=triggerTask is null", reason)

            logV("skipping handleRequest reason=%s", "triggerTask is null")

            return null

        }

        val recentsAnimationRunning =

libs/WindowManager/Shell/src/com/android/wm/shell/freeform/FreeformTaskListener.java

+5 −1
Original line number Diff line number Diff line
@@ -124,9 +124,13 @@ public class FreeformTaskListener implements ShellTaskOrganizer.TaskListener, 
                && mDesktopUserRepositories.isPresent()) {

            DesktopRepository repository =

                    mDesktopUserRepositories.get().getProfile(taskInfo.userId);

            boolean isMinimized = repository.isMinimizedTask(taskInfo.taskId);

            ProtoLog.v(ShellProtoLogGroup.WM_SHELL_DESKTOP_MODE,

                    "Freeform Task Vanished: #%d, isMinimized=%b",

                    taskInfo.taskId, isMinimized);

            // TODO: b/370038902 - Handle Activity#finishAndRemoveTask.

            if (!DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION.isTrue()

                    || !repository.isMinimizedTask(taskInfo.taskId)) {

                    || !isMinimized) {

                // A task that's vanishing should be removed:

                // - If it's not yet minimized. It can be minimized when a back navigation is

                // triggered on a task and the task is closing. It will be marked as minimized in