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

Commit 3e6933f1 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Add some protologs for recents"

parents 134508f1 07113ffc

libs/WindowManager/Shell/src/com/android/wm/shell/protolog/ShellProtoLogGroup.java

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ public enum ShellProtoLogGroup implements IProtoLogGroup { 
            Consts.TAG_WM_STARTING_WINDOW),

    WM_SHELL_BACK_PREVIEW(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, true,

            "ShellBackPreview"),

    WM_SHELL_RECENT_TASKS(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false,

            Consts.TAG_WM_SHELL),

    TEST_GROUP(true, true, false, "WindowManagerShellProtoLogTest");



    private final boolean mEnabled;

libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentTasksController.java

+7 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import androidx.annotation.NonNull; 
import androidx.annotation.Nullable;

import androidx.annotation.VisibleForTesting;



import com.android.internal.protolog.common.ProtoLog;

import com.android.wm.shell.common.RemoteCallable;

import com.android.wm.shell.common.ShellExecutor;

import com.android.wm.shell.common.SingleInstanceRemoteListener;
@@ -41,6 +42,7 @@ import com.android.wm.shell.common.TaskStackListenerCallback; 
import com.android.wm.shell.common.TaskStackListenerImpl;

import com.android.wm.shell.common.annotations.ExternalThread;

import com.android.wm.shell.common.annotations.ShellMainThread;

import com.android.wm.shell.protolog.ShellProtoLogGroup;

import com.android.wm.shell.util.GroupedRecentTaskInfo;

import com.android.wm.shell.util.StagedSplitBounds;
@@ -128,6 +130,8 @@ public class RecentTasksController implements TaskStackListenerCallback, 
        mTaskSplitBoundsMap.put(taskId1, splitBounds);

        mTaskSplitBoundsMap.put(taskId2, splitBounds);

        notifyRecentTasksChanged();

        ProtoLog.v(ShellProtoLogGroup.WM_SHELL_RECENT_TASKS, "Add split pair: %d, %d, %s",

                taskId1, taskId2, splitBounds);

    }



    /**
@@ -141,6 +145,8 @@ public class RecentTasksController implements TaskStackListenerCallback, 
            mTaskSplitBoundsMap.remove(taskId);

            mTaskSplitBoundsMap.remove(pairedTaskId);

            notifyRecentTasksChanged();

            ProtoLog.v(ShellProtoLogGroup.WM_SHELL_RECENT_TASKS, "Remove split pair: %d, %d",

                    taskId, pairedTaskId);

        }

    }
@@ -182,6 +188,7 @@ public class RecentTasksController implements TaskStackListenerCallback, 


    @VisibleForTesting

    void notifyRecentTasksChanged() {

        ProtoLog.v(ShellProtoLogGroup.WM_SHELL_RECENT_TASKS, "Notify recent tasks changed");

        for (int i = 0; i < mCallbacks.size(); i++) {

            mCallbacks.get(i).run();

        }