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

Commit 1d05e7a4 authored by Merissa Mitchell's avatar Merissa Mitchell Committed by Android (Google) Code Review
Browse files

Merge "[WindowDecor] Notify WindowDecor only after split state is updated" into main

parents 8dcbd52b c9ee0ab1

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageTaskListener.java

+2 −1
Original line number Diff line number Diff line
@@ -295,7 +295,6 @@ public class StageTaskListener implements ShellTaskOrganizer.TaskListener { 
        ProtoLog.d(WM_SHELL_SPLIT_SCREEN, "onTaskInfoChanged: taskId=%d taskAct=%s "

                        + "stageId=%s displayId=%d",

                taskInfo.taskId, taskInfo.baseActivity, stageTypeToString(mId), taskInfo.displayId);

        mWindowDecorViewModel.ifPresent(viewModel -> viewModel.onTaskInfoChanged(taskInfo));

        if (mRootTaskInfo.taskId == taskInfo.taskId) {

            mRootTaskInfo = taskInfo;

        } else if (taskInfo.parentTaskId == mRootTaskInfo.taskId) {
@@ -318,6 +317,8 @@ public class StageTaskListener implements ShellTaskOrganizer.TaskListener { 
            throw new IllegalArgumentException(this + "\n Unknown task: " + taskInfo

                    + "\n mRootTaskInfo: " + mRootTaskInfo);

        }

        // Only send onTaskInfoChanged signal after the split state is updated

        mWindowDecorViewModel.ifPresent(viewModel -> viewModel.onTaskInfoChanged(taskInfo));

    }



    @Override