Merge "ViewRoot: Ensure we release surface from setWindowStopped." into pi-dev am: 3ef2d6d9d8

am: 871d0c0759 Change-Id: I5332781f690fed2353910cc2e993f8d4708d6c73
2018-04-18 13:05:53 -07:00
parent 99a0e6ee8f 871d0c0759
commit cf68264741
1 changed files with 4 additions and 0 deletions
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -1339,6 +1339,10 @@ public final class ViewRootImpl implements ViewParent,
            for (int i = 0; i < mWindowStoppedCallbacks.size(); i++) {
                mWindowStoppedCallbacks.get(i).windowStopped(stopped);
            }
+
+            if (mStopped) {
+                mSurface.release();
+            }
        }
    }