Clear WS.mDestroying on AWT.clearAnimatingFlags

am: 3c0d44e633 Change-Id: I7188dc89d20ee7d96f99e0116cef0eaa4b1bcc4e
2016-08-11 21:05:45 +00:00
parent 3d2acc1ab6 3c0d44e633
commit 5d132bf021
1 changed files with 5 additions and 0 deletions
--- a/services/core/java/com/android/server/wm/AppWindowToken.java
+++ b/services/core/java/com/android/server/wm/AppWindowToken.java
@@ -359,6 +359,11 @@ class AppWindowToken extends WindowToken {
                // placement for this window during this period, one or more frame will
                // show up with wrong position or scale.
                win.mWinAnimator.mAnimating = false;
+
+                if (win.mDestroying) {
+                    win.mDestroying = false;
+                    service.mDestroySurface.remove(win);
+                }
            }
        }
        requestUpdateWallpaperIfNeeded();