Merge "Allow to send user leave hint for task switch by touch" into tm-qpr-dev

2022-09-22 18:48:20 +00:00
parent fd1f720d7d 6a009c6c1b
commit e0f07da153
1 changed files with 3 additions and 0 deletions
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -8514,7 +8514,10 @@ public class WindowManagerService extends IWindowManager.Stub
        if (mFocusedInputTarget != t && mFocusedInputTarget != null) {
            mFocusedInputTarget.handleTapOutsideFocusOutsideSelf();
        }
+        // Trigger Activity#onUserLeaveHint() if the order change of task pauses any activities.
+        mAtmService.mTaskSupervisor.mUserLeaving = true;
        t.handleTapOutsideFocusInsideSelf();
+        mAtmService.mTaskSupervisor.mUserLeaving = false;
    }

    @VisibleForTesting