Merge "Fix setLaunchBehind target being stop while back gesture animating"

2022-10-20 07:26:08 +00:00
parent 283098bc2e 8c47781511
commit bde9f07365
1 changed files with 1 additions and 0 deletions
--- a/services/core/java/com/android/server/wm/BackNavigationController.java
+++ b/services/core/java/com/android/server/wm/BackNavigationController.java
@@ -588,6 +588,7 @@ class BackNavigationController {

        ProtoLog.d(WM_DEBUG_BACK_PREVIEW,
                "Setting Activity.mLauncherTaskBehind to true. Activity=%s", activity);
+        activity.mTaskSupervisor.mStoppingActivities.remove(activity);
        activity.getDisplayContent().ensureActivitiesVisible(null /* starting */,
                0 /* configChanges */, false /* preserveWindows */, true);
    }