From a079a274f2395ef7a89ca18c08608aaf7250968f Mon Sep 17 00:00:00 2001
From: Fengjiang Li <fengjial@google.com>
Date: Mon, 5 Feb 2024 14:03:56 -0800
Subject: Make sure OnBackAnimationCallback#onBackStarted is called before
 OnBackAnimationCallback#onBackProgressed

Fix: 317285367
Test: manual
Flag: NONE
Change-Id: I608075f64e9468556be983d9f9e30854e72a68ea
---
 core/java/android/window/WindowOnBackInvokedDispatcher.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/java/android/window/WindowOnBackInvokedDispatcher.java b/core/java/android/window/WindowOnBackInvokedDispatcher.java
index 65075aea7b27..89ad2f7f57ed 100644
--- a/core/java/android/window/WindowOnBackInvokedDispatcher.java
+++ b/core/java/android/window/WindowOnBackInvokedDispatcher.java
@@ -359,11 +359,11 @@ public class WindowOnBackInvokedDispatcher implements OnBackInvokedDispatcher {
                 }
                 final OnBackAnimationCallback callback = getBackAnimationCallback();
                 if (callback != null) {
-                    mProgressAnimator.onBackStarted(backEvent, event ->
-                            callback.onBackProgressed(event));
                     callback.onBackStarted(new BackEvent(
                             backEvent.getTouchX(), backEvent.getTouchY(),
                             backEvent.getProgress(), backEvent.getSwipeEdge()));
+                    mProgressAnimator.onBackStarted(backEvent, event ->
+                            callback.onBackProgressed(event));
                 }
             });
         }
-- 
cgit v1.2.3-59-g8ed1b