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

am: 3ef2d6d9d8 Change-Id: I6c14d19d72d03d975e6b1e34b00fc9ac879e4811
2018-04-18 12:27:38 -07:00
parent d70e0b0413 3ef2d6d9d8
commit 871d0c0759
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();
+            }
        }
    }