diff options
| author | 2022-06-02 16:51:32 -0400 | |
|---|---|---|
| committer | 2022-06-02 16:53:49 -0400 | |
| commit | be9f50bacb4e1422a60396ae05409bac162109ef (patch) | |
| tree | 92353590d0665d4aab44ff7bd0179a73550a8d7b | |
| parent | 0dfb582d5a4da7dddf079c5a0f18bca77411c0de (diff) | |
Notify unlock controller when remote animation ends due to null finishedCallback.
In some cases, when unlocking to an activity that is
rotating, we can end up getting a null apps/callback
since the activity we were unlocking to is destroyed.
In this case, we should still tell the unlock
controller that the animation has ended, so that we
can reset state. This was resulting in the launcher
icons being 'prepared' for unlock indefinitely,
leaving them invisible/shrunken.
Fixes: 231690494
Test: rotate to landscape, lock, keep phone physically in landscape, unlock to launcher
Change-Id: I1e019fabc988f9ad316824d29e3d6fda5f62177b
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index e379d766f0ca..62fc96029781 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -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; } |