Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0eb2be8b authored by Andreas Miko's avatar Andreas Miko Committed by Android (Google) Code Review
Browse files

Merge "Fix unlock jank - send `forceIfAnimating` only for biometric unlocks" into udc-qpr-dev

parents 63f0d1e8 a14aa7c1

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt

+2 −1
Original line number Diff line number Diff line
@@ -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 " +