Merge "Handle DeadObjectExeption when changing users" into tm-qpr-dev am: ba0a4d1647 am: 379feeb445
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20639281 Change-Id: Ia000f111a09e63bb1d6cbd43901905c413598fc9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -824,7 +824,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
|
||||
|
||||
Reference in New Issue
Block a user