diff options
| author | wilsonshih <wilsonshih@google.com> | 2020-08-12 13:00:02 +0800 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-08-20 16:25:08 +0000 |
| commit | 117c0ca0e40b992f28d75b1d24bc2b893288c149 (patch) | |
| tree | 521836847ddc4e3050ea9e237dd56d8fe538481a | |
| parent | bc03ee7cddeb4ead5d4df6b1b645f01241971599 (diff) | |
| download | base-117c0ca0e40b992f28d75b1d24bc2b893288c149.tar.gz | |
Correct the return value of applyAnimationLocked.
The starting window cannot be removed because it is waiting for the
exiting animation finished, This may happen if the animation is not
applied when #selectAnimation cannot find an appropriate animation.
To make the state correct, the return result of #applyAnimationLocked
should not only reference to the hierarchial animation state.
Bug: 161847146
Test: atest WmTests
Change-Id: I69bcd29f2587a3644485a0db05e622f6775cc82f
Merged-In: I69bcd29f2587a3644485a0db05e622f6775cc82f
(cherry picked from commit 48288a505dbcfc31a9a01f75dba24d5f62d428a4)
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowStateAnimator.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/WindowStateAnimator.java b/services/core/java/com/android/server/wm/WindowStateAnimator.java index da45300ed318..80c84ad66423 100644 --- a/services/core/java/com/android/server/wm/WindowStateAnimator.java +++ b/services/core/java/com/android/server/wm/WindowStateAnimator.java @@ -38,6 +38,7 @@ import static com.android.server.wm.ProtoLogGroup.WM_DEBUG_ORIENTATION; import static com.android.server.wm.ProtoLogGroup.WM_DEBUG_STARTING_WINDOW; import static com.android.server.wm.ProtoLogGroup.WM_SHOW_SURFACE_ALLOC; import static com.android.server.wm.ProtoLogGroup.WM_SHOW_TRANSACTIONS; +import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_WINDOW_ANIMATION; import static com.android.server.wm.WindowContainer.AnimationFlags.PARENTS; import static com.android.server.wm.WindowContainer.AnimationFlags.TRANSITION; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG; @@ -1478,7 +1479,7 @@ class WindowStateAnimator { mWin.getDisplayContent().adjustForImeIfNeeded(); } - return mWin.isAnimating(PARENTS); + return mWin.isAnimating(0 /* flags */, ANIMATION_TYPE_WINDOW_ANIMATION); } void dumpDebug(ProtoOutputStream proto, long fieldId) { |