Merge "After keyguard exit animation, finish before notifying" into udc-dev

2023-04-05 09:00:32 +00:00
parent db46763eab c52deb2b38
commit c6be7237a5
1 changed files with 2 additions and 2 deletions
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
@@ -2856,14 +2856,14 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
                        + " wasShowing=" + wasShowing);
            }

+            mKeyguardUnlockAnimationControllerLazy.get()
+                    .notifyFinishedKeyguardExitAnimation(cancelled);
            finishSurfaceBehindRemoteAnimation(cancelled);

            // Dispatch the callback on animation finishes.
            mUpdateMonitor.dispatchKeyguardDismissAnimationFinished();
        });

-        mKeyguardUnlockAnimationControllerLazy.get().notifyFinishedKeyguardExitAnimation(
-                cancelled);
    }

    /**