| commit | f852424efa064cc98ca474c6a47877d07845cb77 | [log] [tgz] |
|---|---|---|
| author | Robin Lee <rgl@google.com> | Fri Mar 31 00:09:56 2023 +0000 |
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Mon Jun 05 03:19:13 2023 +0000 |
| tree | 99724d847e525a5ee9eb5b48cd824bd11a773811 | |
| parent | 6ab4b8a97d8b2af0b9064da42da5955769c532a0 [diff] |
Cancel current animation instead of candidate Otherwise everything along the way confidently ignores this and Keyguard doesn't even see the timeout and force-abort coming when it hits. This leaves an animation timer running for 950ms which sets occlude status on finish callback and causes unpleasant race conditions. Test: atest android.server.wm.KeyguardTests Test: specific case to be added in b/274003805 Bug: 275650364 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8ffedf11e398f9a6aa8b30cff5f06b102fd54536) Merged-In: I7b3dcd06e7483fde745a1d56dfee7c4efc262ed7 Change-Id: I7b3dcd06e7483fde745a1d56dfee7c4efc262ed7