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

Commit b586047b authored by Josh Tsuji's avatar Josh Tsuji Committed by Automerger Merge Worker
Browse files

Merge "Catch one more DeadObjectException." into udc-dev am: 459425f6 am: d2091f4f 

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



Change-Id: Idba47eea556c1d8929f3d2d5ce2dc39dbb6a26e6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 04bccdd6 d2091f4f

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

+9 −2
Original line number Diff line number Diff line
@@ -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) {

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

            }

        }

    }