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

Change-Id: I25dca57b5d608a3ff1e058806ecd51245f599a37
2020-05-04 20:44:14 +00:00
parent adedfa307c ca6c0c8075
commit 9e0b864391
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();
    }

    /**