Merge "Don't inflate mSplitDecorManager in sync transaction callback" into tm-dev

1 files changed, 6 insertions, 8 deletions

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageTaskListener.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageTaskListener.java
index 9fd5d2003873..7571e29a86a3 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageTaskListener.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageTaskListener.java
@@ -224,14 +224,12 @@ class StageTaskListener implements ShellTaskOrganizer.TaskListener {
         if (mRootTaskInfo.taskId == taskInfo.taskId) {
             // Inflates split decor view only when the root task is visible.
             if (mRootTaskInfo.isVisible != taskInfo.isVisible) {
-                mSyncQueue.runInSync(t -> {
-                    if (taskInfo.isVisible) {
-                        mSplitDecorManager.inflate(mContext, mRootLeash,
-                                taskInfo.configuration.windowConfiguration.getBounds());
-                    } else {
-                        mSplitDecorManager.release(t);
-                    }
-                });
+                if (taskInfo.isVisible) {
+                    mSplitDecorManager.inflate(mContext, mRootLeash,
+                            taskInfo.configuration.windowConfiguration.getBounds());
+                } else {
+                    mSyncQueue.runInSync(t -> mSplitDecorManager.release(t));
+                }
             }
             mRootTaskInfo = taskInfo;
         } else if (taskInfo.parentTaskId == mRootTaskInfo.taskId) {