diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.kt b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.kt index 3e7d81a9de901..063b41e8db0f9 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.kt @@ -390,11 +390,14 @@ constructor( return true } - // Only pause auth if we're not on the keyguard AND we're not transitioning to doze - // (ie: dozeAmount = 0f). For the UnlockedScreenOffAnimation, the statusBarState is + // Only pause auth if we're not on the keyguard AND we're not transitioning to doze. + // For the UnlockedScreenOffAnimation, the statusBarState is // delayed. However, we still animate in the UDFPS affordance with the - // mUnlockedScreenOffDozeAnimator. - if (statusBarState != StatusBarState.KEYGUARD && lastDozeAmount == 0f) { + // unlockedScreenOffDozeAnimator. + if ( + statusBarState != StatusBarState.KEYGUARD && + !unlockedScreenOffAnimationController.isAnimationPlaying() + ) { return true } if (isBouncerExpansionGreaterThan(.5f)) {