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

Commit f0e36ac7 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Fix Display SurfaceControl leak" into rvc-dev am: 87293fda 

Change-Id: Id022aed80b4c459db61d3fc8e9a0066c73e95e28
parents f84af9e7 87293fda

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

+3 −0
Original line number Diff line number Diff line
@@ -2712,6 +2712,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
@@ -524,13 +524,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();