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

Commit ad295f2f authored by Chavi Weingarten's avatar Chavi Weingarten Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18445265



Change-Id: I1ebea9462d54d468fe6f48db4486742046d57116
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ee5516f4 fd304f2f

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

+6 −8
Original line number Diff line number Diff line
@@ -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);

                    mSyncQueue.runInSync(t -> mSplitDecorManager.release(t));

                }

                });

            }

            mRootTaskInfo = taskInfo;

        } else if (taskInfo.parentTaskId == mRootTaskInfo.taskId) {