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

Commit 143192c8 authored by Brad Hinegardner's avatar Brad Hinegardner Committed by Automerger Merge Worker
Browse files

Merge "Handle DeadObjectExeption when changing users" into tm-qpr-dev am: ba0a4d16 am: 379feeb4 

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



Change-Id: Ia000f111a09e63bb1d6cbd43901905c413598fc9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 427b18dd 379feeb4

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

+5 −1
Original line number Diff line number Diff line
@@ -824,7 +824,11 @@ class KeyguardUnlockAnimationController @Inject constructor( 
        surfaceBehindEntryAnimator.cancel()

        surfaceBehindAlpha = 1f

        setSurfaceBehindAppearAmount(1f)

        try {

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

        }  catch (e: RemoteException) {

            Log.e(TAG, "Remote exception in notifyFinishedKeyguardExitAnimation", e)

        }



        // That target is no longer valid since the animation finished, null it out.

        surfaceBehindRemoteAnimationTargets = null