commit de84443489e95f1b406e3ba8d9e864d8b0adf061
author Robert Carr <racarr@google.com> Thu May 04 13:45:45 2017 -0700
committer Robert Carr <racarr@google.com> Mon May 08 12:12:30 2017 -0700
tree 613128f3cd3f1cf51db567ae457dbc4a337f6021
parent 6b1989c7e28a56c16ffd6bd80c7967419191cbac

SurfaceView: Release Surface with SurfaceControl.

Not so drastic as we were releasing the Server side resources
anyway but the close guard is producing a strict mode warning.

Bug: 35955183
Test: cts-tradefed run cts -m CtsViewTestCases -t android.view.cts.SurfaceViewTest#surfaceInvalidatedWhileDetaching
Change-Id: Id250fff8d001d5d82458af1a732c0e123f925dad

core/java/android/view/SurfaceView.java

diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java
index f539752..2ade9b5 100644
--- a/core/java/android/view/SurfaceView.java
+++ b/core/java/android/view/SurfaceView.java
@@ -678,6 +678,7 @@
                     mIsCreating = false;
                     if (mSurfaceControl != null && !mSurfaceCreated) {
                         mSurfaceControl.destroy();
+                        mSurface.release();
                         mSurfaceControl = null;
                     }
                 }