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

Commit 2a4cf34a authored by Andreas Miko's avatar Andreas Miko Committed by Automerger Merge Worker
Browse files

Merge "Fix unlock jank - send `forceIfAnimating` only for biometric unlocks"... 

Merge "Fix unlock jank - send `forceIfAnimating` only for biometric unlocks" into udc-qpr-dev am: 0eb2be8b am: dcecad17

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25008468



Change-Id: I80e44818b8f00b032cae17219bd8f639bb15fbe3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9efcb17a dcecad17

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

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