| commit | 66a8088f989363d920734e76ab03cbcfd040e461 | [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> | Fri Mar 31 22:50:54 2023 +0000 |
| tree | 9bf45afc846c425211c70ed28b9ec240bb613a28 | |
| parent | f8cecc36710fcb7a1f3b5daaf94d6c1a7b959916 [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:e489cd0736628ea6bf905925a7350c62d697377e) Merged-In: I7b3dcd06e7483fde745a1d56dfee7c4efc262ed7 Change-Id: I7b3dcd06e7483fde745a1d56dfee7c4efc262ed7