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

Commit 94dff647 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I4fdf368e,Ibc6be890 into rvc-dev am: 48dc1924 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11932511

Change-Id: I318c62452be95fbe8f6235b862aeca2bad86dc5c
parents eb461e2e 48dc1924

core/java/android/view/SurfaceControlViewHost.java

+12 −1
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
@@ -273,6 +284,6 @@ public class SurfaceControlViewHost { 
     */

    public void release() {

        // ViewRoot will release mSurfaceControl for us.

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

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

    }

}