diff options
| author | 2023-05-17 11:45:57 +0000 | |
|---|---|---|
| committer | 2023-05-17 11:45:57 +0000 | |
| commit | 71a5b007f41c20ffecf48b7cd11342268dd58675 (patch) | |
| tree | 915e3ebcac8e262bb92de8bea2439986062b9807 | |
| parent | 6580cba3fe3c955557281920c23ca4f62b77fbdc (diff) | |
| parent | 36208fb4bafec41f4158aaeb42e6b8ea560cdb96 (diff) | |
Merge "Fix wallpaper flicker when quick switching apps using taskbar swipe" into udc-dev am: 36208fb4ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23262476
Change-Id: Ia5b80296b8eca93459ea77e6b2a1b26e7ec8c39c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowState.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index ba942821f244..7cd7f6975bbd 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -1932,7 +1932,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP final ActivityRecord atoken = mActivityRecord; if (atoken != null) { return ((!isParentWindowHidden() && atoken.isVisible()) - || isAnimating(TRANSITION | PARENTS)); + || isAnimationRunningSelfOrParent()); } final WallpaperWindowToken wtoken = mToken.asWallpaperToken(); if (wtoken != null) { |