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

Commit b9067b1d authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Automerger Merge Worker
Browse files

Merge "[ShellTrans] Fix SystemUI crash when finish keyguard animation." into... 

Merge "[ShellTrans] Fix SystemUI crash when finish keyguard animation." into tm-qpr-dev am: b61b09ee am: d12c8ea6

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



Change-Id: Ic9f66bd228cb546184979a08af4ad898d58cd36d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cbf5d456 d12c8ea6

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

+4 −3
Original line number Diff line number Diff line
@@ -321,6 +321,7 @@ class KeyguardUnlockAnimationController @Inject constructor( 
                    // and unlock the device as well as hiding the surface.

                    if (surfaceBehindAlpha == 0f) {

                        Log.d(TAG, "surfaceBehindAlphaAnimator#onAnimationEnd")

                        surfaceBehindRemoteAnimationTargets = null

                        keyguardViewMediator.get().finishSurfaceBehindRemoteAnimation(

                            false /* cancelled */)

                    } else {
@@ -820,10 +821,10 @@ class KeyguardUnlockAnimationController @Inject constructor( 
        // Make sure we made the surface behind fully visible, just in case. It should already be

        // fully visible. The exit animation is finished, and we should not hold the leash anymore,

        // so forcing it to 1f.

        surfaceBehindAlphaAnimator.cancel()

        surfaceBehindEntryAnimator.cancel()

        surfaceBehindAlpha = 1f

        setSurfaceBehindAppearAmount(1f)

        surfaceBehindAlphaAnimator.cancel()

        surfaceBehindEntryAnimator.cancel()

        try {

            launcherUnlockController?.setUnlockAmount(1f, false /* forceIfAnimating */)

        } catch (e: RemoteException) {