Merge "Handle DeadObjectExeption when changing users" into tm-qpr-dev am: ba0a4d1647

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

Change-Id: I87ded1e63f54092a2f42c46f99ed3ecc116aa0de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Brad Hinegardner
2022-12-07 20:03:41 +00:00
committed by Automerger Merge Worker

View File

@@ -829,7 +829,11 @@ class KeyguardUnlockAnimationController @Inject constructor(
surfaceBehindEntryAnimator.cancel()
surfaceBehindAlpha = 1f
setSurfaceBehindAppearAmount(1f)
launcherUnlockController?.setUnlockAmount(1f, false /* forceIfAnimating */)
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