Merge "Revert "ViewRoot: Ensure we release surface from setWindowStopped."" into pi-dev
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index 937e9f4..730c372 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -1334,7 +1334,6 @@
                 if (renderer != null) {
                     renderer.destroyHardwareResources(mView);
                 }
-                mSurface.release();
             }
 
             for (int i = 0; i < mWindowStoppedCallbacks.size(); i++) {