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

2022-12-07 19:38:49 +00:00
parent 2632266bff 16ddd9e807
commit ba0a4d1647
1 changed files with 5 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt
@@ -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