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

Commit 0eb37fa4 authored by Chavi Weingarten's avatar Chavi Weingarten Committed by Android (Google) Code Review
Browse files

Merge "Fix Display SurfaceControl leak"

parents ac7a0fa6 93938469

services/core/java/com/android/server/wm/DisplayContent.java

+3 −0
Original line number Diff line number Diff line
@@ -2717,6 +2717,9 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo 
            mRemovingDisplay = false;

        }



        // Apply the pending transaction here since we may not be able to reach the DisplayContent

        // on the next traversal if it's removed from RootWindowContainer child list.

        getPendingTransaction().apply();

        mWmService.mWindowPlacerLocked.requestTraversal();

    }

services/core/java/com/android/server/wm/WindowContainer.java

+0 −7
Original line number Diff line number Diff line
@@ -530,13 +530,6 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< 


        if (mSurfaceControl != null) {

            getPendingTransaction().remove(mSurfaceControl);



            // Merge to parent transaction to ensure the transactions on this WindowContainer are

            // applied in native even if WindowContainer is removed.

            if (mParent != null) {

                mParent.getPendingTransaction().merge(getPendingTransaction());

            }



            setSurfaceControl(null);

            mLastSurfacePosition.set(0, 0);

            scheduleAnimation();