Merge "Fix leaking animation" into nyc-dev

2016-02-22 21:18:31 +00:00
parent 1e413f5b77 02b74b9420
commit 0822a7e272
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/WindowAnimator.java
+++ b/services/core/java/com/android/server/wm/WindowAnimator.java
@@ -530,7 +530,7 @@ public class WindowAnimator {
        for (int i = windows.size() - 1; i >= 0; i--) {
            final WindowState win = windows.get(i);
            WindowStateAnimator winAnimator = win.mWinAnimator;
-            if (winAnimator.mSurfaceController == null) {
+            if (winAnimator.mSurfaceController == null || !winAnimator.hasSurface()) {
                continue;
            }