From 94d17482c0c1c3f666a67afaa4bca871dee050ea Mon Sep 17 00:00:00 2001 From: Josh Tsuji Date: Tue, 30 May 2023 16:44:02 -0400 Subject: Catch one more DeadObjectException. Missed this one in ag/22135937. Fixes: 284682461 Test: atest SystemUITests Change-Id: I1d9bba252544bec37b454dd4d5b8267c20435958 --- .../systemui/keyguard/KeyguardUnlockAnimationController.kt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt index 29a7fe7d061a..c706363c9454 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt @@ -33,10 +33,10 @@ import android.view.SyncRtSurfaceTransactionApplier import android.view.View import androidx.annotation.VisibleForTesting import androidx.core.math.MathUtils +import com.android.app.animation.Interpolators import com.android.internal.R import com.android.keyguard.KeyguardClockSwitchController import com.android.keyguard.KeyguardViewController -import com.android.app.animation.Interpolators import com.android.systemui.dagger.SysUISingleton import com.android.systemui.flags.FeatureFlags import com.android.systemui.flags.Flags @@ -433,7 +433,14 @@ class KeyguardUnlockAnimationController @Inject constructor( // animate state. if (!keyguardStateController.isKeyguardGoingAway && willUnlockWithInWindowLauncherAnimations) { - launcherUnlockController?.setUnlockAmount(1f, true /* forceIfAnimating */) + try { + launcherUnlockController?.setUnlockAmount(1f, true /* forceIfAnimating */) + } catch (e: DeadObjectException) { + Log.e(TAG, "launcherUnlockAnimationController was dead, but non-null in " + + "onKeyguardGoingAwayChanged(). Catching exception as this should mean " + + "Launcher is in the process of being destroyed, but the IPC to System UI " + + "telling us hasn't arrived yet.") + } } } -- cgit v1.2.3-59-g8ed1b