From c52deb2b38f109c482003f14e26848aff8a8f5d2 Mon Sep 17 00:00:00 2001
From: Robin Lee <rgl@google.com>
Date: Tue, 4 Apr 2023 14:11:06 +0000
Subject: After keyguard exit animation, finish before notifying

Change-Id: I591fe31294ec56fd28b3e893868fe213c037fff4
Test: atest android.server.wm.KeyguardTests
Test: microbench/systemui/main/systemui-lockscreen-1-jank-suite
Test: atest PlatformScenarioTests:android.platform.test.scenario.sysui.notification.ExpandNotificationByDragging
Bug: 276503488
Bug: 276572219
---
 .../src/com/android/systemui/keyguard/KeyguardViewMediator.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
index b1efdd733faa..c102c5b57375 100644
--- 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);
     }
 
     /**
-- 
cgit v1.2.3-59-g8ed1b