diff options
| author | 2023-04-14 02:45:09 +0000 | |
|---|---|---|
| committer | 2023-04-14 02:45:09 +0000 | |
| commit | af3ba54631d025204a312f95d77a7c04bbe688ba (patch) | |
| tree | 9d23715bf59a346e9de8170cc85ea3b9420291f0 /libs | |
| parent | 6bbbc4bb0b51dbfc9c0c2eea1ea8de06243f240a (diff) | |
| parent | 55e760275ade295ec9eede257c1c5d6d1efbae8c (diff) | |
Merge "Ignore tap ouside for transient-hide task" into udc-dev
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java index c8d6a5e8e00b..44d7e6de8ec4 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java @@ -540,7 +540,12 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler { mergeActivityOnly(info, t); } else if (!didMergeThings) { // Didn't recognize anything in incoming transition so don't merge it. - Slog.w(TAG, "Don't know how to merge this transition."); + Slog.w(TAG, "Don't know how to merge this transition, foundRecentsClosing=" + + foundRecentsClosing); + if (foundRecentsClosing) { + mWillFinishToHome = false; + cancel(false /* toHome */); + } return; } // At this point, we are accepting the merge. |