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

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

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

Change-Id: Icfe43c10b2e6a7a0022c125358472513d65e016e
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:14:39 +00:00
committed by Automerger Merge Worker
parent 1ba0219c95 4e1ecd1e40
commit 0fcbea6767
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
View File

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