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

Commit d69caeee authored by Bidhya Sharma's avatar Bidhya Sharma Committed by Android (Google) Code Review
Browse files

Merge "Revert "Don't copy null surface control and remove lingering references... 

Merge "Revert "Don't copy null surface control and remove lingering references to leashes"" into tm-qpr-dev
parents 432c49aa ad41a1e8

libs/WindowManager/Shell/src/com/android/wm/shell/RootDisplayAreaOrganizer.java

+0 −2
Original line number Diff line number Diff line
@@ -85,8 +85,6 @@ public class RootDisplayAreaOrganizer extends DisplayAreaOrganizer { 
        }



        mDisplayAreasInfo.remove(displayId);

        mLeashes.get(displayId).release();

        mLeashes.remove(displayId);

    }



    @Override

libs/WindowManager/Shell/src/com/android/wm/shell/ShellTaskOrganizer.java

+1 −5
Original line number Diff line number Diff line
@@ -529,11 +529,7 @@ public class ShellTaskOrganizer extends TaskOrganizer implements 
            }



            final int taskId = taskInfo.taskId;

            final TaskAppearedInfo appearedInfo = mTasks.get(taskId);

            final TaskListener listener = getTaskListener(appearedInfo.getTaskInfo());

            if (appearedInfo.getLeash() != null) {

                appearedInfo.getLeash().release();

            }

            final TaskListener listener = getTaskListener(mTasks.get(taskId).getTaskInfo());

            mTasks.remove(taskId);

            if (listener != null) {

                listener.onTaskVanished(taskInfo);

libs/WindowManager/Shell/src/com/android/wm/shell/hidedisplaycutout/HideDisplayCutoutOrganizer.java

+2 −3
Original line number Diff line number Diff line
@@ -128,10 +128,9 @@ class HideDisplayCutoutOrganizer extends DisplayAreaOrganizer { 


            final WindowContainerTransaction wct = new WindowContainerTransaction();

            final SurfaceControl.Transaction t = new SurfaceControl.Transaction();

            final SurfaceControl leash = mDisplayAreaMap.get(displayAreaInfo.token);

            applyBoundsAndOffsets(displayAreaInfo.token, leash, wct, t);

            applyBoundsAndOffsets(

                    displayAreaInfo.token, mDisplayAreaMap.get(displayAreaInfo.token), wct, t);

            applyTransaction(wct, t);

            leash.release();

            mDisplayAreaMap.remove(displayAreaInfo.token);

        }

    }

libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedDisplayAreaOrganizer.java

+0 −4
Original line number Diff line number Diff line
@@ -159,10 +159,6 @@ public class OneHandedDisplayAreaOrganizer extends DisplayAreaOrganizer { 


    @Override

    public void onDisplayAreaVanished(@NonNull DisplayAreaInfo displayAreaInfo) {

        final SurfaceControl leash = mDisplayAreaTokenMap.get(displayAreaInfo.token);

        if (leash != null) {

            leash.release();

        }

        mDisplayAreaTokenMap.remove(displayAreaInfo.token);

    }

libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java

+0 −1
Original line number Diff line number Diff line
@@ -943,7 +943,6 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 
        mPipBoundsState.setBounds(new Rect());

        mPipUiEventLoggerLogger.setTaskInfo(null);

        mMainExecutor.executeDelayed(() -> mPipMenuController.detach(), 0);

        mLeash = null;



        if (info.displayId != Display.DEFAULT_DISPLAY && mOnDisplayIdChangeCallback != null) {

            mOnDisplayIdChangeCallback.accept(Display.DEFAULT_DISPLAY);