summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Robin Lee <rgl@google.com> 2023-05-11 15:55:45 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-05-11 15:55:45 +0000
commit3b92806912c4a0fc42054e25ccfb7049d6cbef90 (patch)
tree0266b015200f62001c39107a093e4677135a1448
parentd6181d7c2bf850139bd06138fa11fb0591dc83ad (diff)
parenta7500e4aa465dcf887f5e5490ebbfc069eb2ff2e (diff)
Merge "Cancel the wallpaper animation after the tests" into udc-dev
-rw-r--r--packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardUnlockAnimationControllerTest.kt4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardUnlockAnimationControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardUnlockAnimationControllerTest.kt
index 47df64fc33e2..0a9618c2d568 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardUnlockAnimationControllerTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardUnlockAnimationControllerTest.kt
@@ -113,8 +113,8 @@ class KeyguardUnlockAnimationControllerTest : SysuiTestCase() {
@After
fun tearDown() {
- keyguardUnlockAnimationController.surfaceBehindEntryAnimator.cancel()
- keyguardUnlockAnimationController.surfaceBehindAlphaAnimator.cancel()
+ keyguardUnlockAnimationController.notifyFinishedKeyguardExitAnimation(true)
+ keyguardUnlockAnimationController.wallpaperAlphaAnimator.cancel()
}
/**