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

Change-Id: I5afb6173479b64cf7a289dceb4a69b5a172c1e21
2020-05-04 20:21:39 +00:00
parent 46618712ed 1e15db9ce4
commit 37b29738f3
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();
    }

    /**