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

am: 9cbe611f4a Change-Id: I1b18f556b4b42f81ddca69ae5ce420d7a612bf6b
2017-05-09 17:14:05 +00:00
parent 2bd8bdc89f 9cbe611f4a
commit bb8131b1d7
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;
                    }
                }