summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Andreas Miko <amiko@google.com> 2023-10-10 19:50:05 +0000
committer Andreas Miko <amiko@google.com> 2023-10-11 12:41:51 +0000
commita14aa7c175a72e175da84b5a95b95079b1ec3d2c (patch)
tree361d16e5f88bc827a20d8583150b2905ab4cd725
parent010f0da51618771a2fd45145e5cbef36bb4cf972 (diff)
Fix unlock jank - send `forceIfAnimating` only for biometric unlocks
The launcher animation may get interrupted at >60% due to a fail-safe that is front running the launcher animation. Bug: b/301903832 Test: Verified fix by bug reporter Change-Id: Id8c9dfbbfb2af0b769c113824ba7b39db00b30b2
-rw-r--r--packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt3
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt
index 32a9559127a2..9eab14f57358 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt
@@ -445,7 +445,8 @@ class KeyguardUnlockAnimationController @Inject constructor(
if (!keyguardStateController.isKeyguardGoingAway &&
willUnlockWithInWindowLauncherAnimations) {
try {
- launcherUnlockController?.setUnlockAmount(1f, true /* forceIfAnimating */)
+ launcherUnlockController?.setUnlockAmount(1f,
+ biometricUnlockControllerLazy.get().isWakeAndUnlock /* forceIfAnimating */)
} catch (e: DeadObjectException) {
Log.e(TAG, "launcherUnlockAnimationController was dead, but non-null in " +
"onKeyguardGoingAwayChanged(). Catching exception as this should mean " +