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

Commit d26aca69 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

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

Merge "Merge changes I4fdf368e,Ibc6be890 into rvc-dev am: 48dc1924 am: 6affc270" into rvc-d1-dev-plus-aosp
parents fed445a5 9a56fc9d
Loading
Loading
Loading
Loading
+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 */);
    }
}