Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b251360e authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge "Finish recents if it was not in transition when merging" into main

parents 975bdc96 4d84b56c

libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java

+2 −2
Original line number Diff line number Diff line
@@ -822,8 +822,8 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler { 
            } 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, foundRecentsClosing="

                        + foundRecentsClosing);

                if (foundRecentsClosing) {

                        + foundRecentsClosing + " recentsTaskId=" + mRecentsTaskId);

                if (foundRecentsClosing || mRecentsTaskId < 0) {

                    mWillFinishToHome = false;

                    cancel(false /* toHome */, false /* withScreenshots */, "didn't merge");

                }