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

Commit 7a31b8b1 authored by Robert Carr's avatar Robert Carr
Browse files

SurfaceControlViewHost: Release ViewRoot from finalizer 

If we don't explicitly go through the doDie process the
WindowManagerGlobal instance will hold the ViewRoot alive
indefinitely. This accidental leak could be very expensive so
we prevent it with a finalizer.

Bug: 157709599
Test: Existing tests pass
Change-Id: I4fdf368eed4b4e43faacd9f62b6d9fddfd9b7ef2
parent 5409e241

core/java/android/view/SurfaceControlViewHost.java

+11 −0
Original line number Diff line number Diff line
@@ -177,6 +177,17 @@ public class SurfaceControlViewHost { 
        mAccessibilityEmbeddedConnection = mViewRoot.getAccessibilityEmbeddedConnection();

    }



    /**

     * @hide

     */

    @Override

    protected void finalize() throws Throwable {

        // We aren't on the UI thread here so we need to pass false to

        // doDie

        mViewRoot.die(false /* immediate */);

    }





    /**

     * Return a SurfacePackage for the root SurfaceControl of the embedded hierarchy.

     * Rather than be directly reparented using {@link SurfaceControl.Transaction} this