From 3c0d44e6336bf15e73f2461d97fcd24fe83ed2ef Mon Sep 17 00:00:00 2001 From: Wale Ogunwale Date: Thu, 11 Aug 2016 09:34:45 -0700 Subject: Clear WS.mDestroying on AWT.clearAnimatingFlags We call AppWindowToken.clearAnimatingFlags() when an app token is no longer considered exiting since it is now part of the opening app transition. To the same effect we should no longer consider its windows destroying so they can be factored in when decided what to do during the transition like picking the right wallpaper target. Bug: 30790402 Change-Id: Ide94af72a38bd4a955abb122b47f921fd3f70652 --- services/core/java/com/android/server/wm/AppWindowToken.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/services/core/java/com/android/server/wm/AppWindowToken.java b/services/core/java/com/android/server/wm/AppWindowToken.java index d55226f24c6c..1f385dfac5a5 100644 --- 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(); -- cgit v1.2.3-59-g8ed1b