Merge "SurfaceView: Release Surface with SurfaceControl." into oc-dev

am: 3630fd4e11 Change-Id: I8c841d11033c9bf18987b59edce0ccf93bb984b9
2017-05-09 16:36:57 +00:00
parent bcc047ca4f 3630fd4e11
commit 9cbe611f4a
1 changed files with 1 additions and 0 deletions
--- a/core/java/android/view/SurfaceView.java
+++ b/core/java/android/view/SurfaceView.java
@@ -678,6 +678,7 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb
                    mIsCreating = false;
                    if (mSurfaceControl != null && !mSurfaceCreated) {
                        mSurfaceControl.destroy();
+                        mSurface.release();
                        mSurfaceControl = null;
                    }
                }