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

Commit 56f93335 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Do not attach or reparent child surface if the TaskView's surface has... 

Merge "Do not attach or reparent child surface if the TaskView's surface has not been created." into main
parents d6e9963f c70d1d78

libs/WindowManager/Shell/src/com/android/wm/shell/taskview/TaskViewTaskController.java

+8 −0
Original line number Diff line number Diff line
@@ -348,12 +348,20 @@ public class TaskViewTaskController implements ShellTaskOrganizer.TaskListener { 


    @Override

    public void attachChildSurfaceToTask(int taskId, SurfaceControl.Builder b) {

        if (BubbleAnythingFlagHelper.enableCreateAnyBubble()) {

            // TODO(b/419342398): Add a notifier when the surface is ready for this to be called.

            if (!mIsInitialized) return;

        }

        b.setParent(findTaskSurface(taskId));

    }



    @Override

    public void reparentChildSurfaceToTask(int taskId, SurfaceControl sc,

            SurfaceControl.Transaction t) {

        if (BubbleAnythingFlagHelper.enableCreateAnyBubble()) {

            // TODO(b/419342398): Add a notifier when the surface is ready for this to be called.

            if (!mIsInitialized) return;

        }

        t.reparent(sc, findTaskSurface(taskId));

    }