Merge "Notify unlock controller when remote animation ends due to null finishedCallback." into tm-dev am: 4e1ecd1e40 am: 8d975c6df2

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

Change-Id: I25a51ab94ffa35bf0b1ef75ecf62a940f597d201
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-06-03 18:32:04 +00:00
committed by Automerger Merge Worker

View File

@@ -2497,6 +2497,8 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable,
// supported, so it's always null.
mContext.getMainExecutor().execute(() -> {
if (finishedCallback == null) {
mKeyguardUnlockAnimationControllerLazy.get()
.notifyFinishedKeyguardExitAnimation(false /* cancelled */);
mInteractionJankMonitor.end(CUJ_LOCKSCREEN_UNLOCK_ANIMATION);
return;
}