Merge "Fix leaking animation" into nyc-dev am: 0822a7e272

am: 33f776dda8

* commit '33f776dda8b8ba2d0c64d31ff0bedc991be7d94b':
  Fix leaking animation

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;
             }