diff options
| author | 2020-08-19 16:19:51 +0000 | |
|---|---|---|
| committer | 2020-08-19 16:19:51 +0000 | |
| commit | d58e211dec3eff88daeb513843b2ed1a4d60223e (patch) | |
| tree | 4f25cb7982ebcf41c6875aa63fb9ead40c5b87f9 | |
| parent | 02b0205641fbe3a79fcf2610ad3753fa823dc60e (diff) | |
| parent | af90f3fe7e35fd638ded0a6573925cb62f068381 (diff) | |
Merge "Correct the return value of applyAnimationLocked." into rvc-d1-dev am: af90f3fe7e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12383608
Change-Id: I867ca42c8af309369b0da2c497e9b98bd48d29d6
| -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) { |