Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Catch one more DeadObjectException." into udc-dev

Browse Source
This commit is contained in:
Josh Tsuji
2023-05-31 17:18:11 +00:00
committed by Android (Google) Code Review
parent 13ff988943 94d17482c0
commit 459425f68a
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt
View File

@@ -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.")
}
}
}