From de84443489e95f1b406e3ba8d9e864d8b0adf061 Mon Sep 17 00:00:00 2001
From: Robert Carr <racarr@google.com>
Date: Thu, 4 May 2017 13:45:45 -0700
Subject: [PATCH] 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 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java
index f53975239e4af..2ade9b572a1ab 100644
--- 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;
                     }
                 }