Merge "SurfaceControlViewHost: Let ViewRoot release control." into rvc-dev am: 1e15db9ce4 am: ca6c0c8075 am: 9e0b864391 am: 92113a466f

Change-Id: Ifd7c745761e776eb95e441d1382018fbb405bc62
2020-05-04 20:46:06 +00:00
parent a4fcf6aae1 92113a466f
commit 4f790a2865
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/view/SurfaceControlViewHost.java
+++ b/core/java/android/view/SurfaceControlViewHost.java
@@ -272,8 +272,8 @@ public class SurfaceControlViewHost {
     * and render the object unusable.
     */
    public void release() {
+        // ViewRoot will release mSurfaceControl for us.
        mViewRoot.die(false /* immediate */);
-        mSurfaceControl.release();
    }

    /**