Merge "Preventing start back navigation before new activity window created." into main

1 files changed, 3 insertions, 1 deletions

diff --git a/services/core/java/com/android/server/wm/BackNavigationController.java b/services/core/java/com/android/server/wm/BackNavigationController.java
index e76a83453a9d..094ad187686c 100644
--- a/services/core/java/com/android/server/wm/BackNavigationController.java
+++ b/services/core/java/com/android/server/wm/BackNavigationController.java
@@ -190,7 +190,9 @@ class BackNavigationController {
             currentActivity = window.mActivityRecord;
             currentTask = window.getTask();
             if ((currentTask != null && !currentTask.isVisibleRequested())
-                    || (currentActivity != null && !currentActivity.isVisibleRequested())) {
+                    || (currentActivity != null && !currentActivity.isVisibleRequested())
+                    || (currentActivity != null && currentTask != null
+                            && currentTask.getTopNonFinishingActivity() != currentActivity)) {
                 // Closing transition is happening on focus window and should be update soon,
                 // don't drive back navigation with it.
                 ProtoLog.d(WM_DEBUG_BACK_PREVIEW, "Focus window is closing.");