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

Change-Id: I567c9c6a403aef154f39f86da69049e741604536
2020-05-04 20:45:15 +00:00
parent 627a888326 9e0b864391
commit 92113a466f
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();
    }

    /**