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

Commit 68bc06af authored by Tony Huang's avatar Tony Huang Committed by Automerger Merge Worker
Browse files

Merge "Clear recents tile if exception exit case" into udc-qpr-dev am: 593cc160 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24004024



Change-Id: I8897f7a4082188ff3d175d8bfc832149eca4d0f2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 44a8689f 593cc160

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java

+9 −0
Original line number Diff line number Diff line
@@ -2564,6 +2564,9 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
                // so don't handle it.

                Log.e(TAG, "Somehow removed the last task in a stage outside of a proper "

                        + "transition.");

                // This new transition would be merged to current one so we need to clear

                // tile manually here.

                clearSplitPairedInRecents(EXIT_REASON_APP_FINISHED);

                final WindowContainerTransaction wct = new WindowContainerTransaction();

                final int dismissTop = (dismissStages.size() == 1

                        && getStageType(dismissStages.valueAt(0)) == STAGE_TYPE_MAIN)
@@ -2747,6 +2750,12 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
                Log.w(TAG, splitFailureMessage("startPendingEnterAnimation",

                        "launched 2 tasks in split, but didn't receive "

                        + "2 tasks in transition. Possibly one of them failed to launch"));

                if (mRecentTasks.isPresent() && mainChild != null) {

                    mRecentTasks.get().removeSplitPair(mainChild.getTaskInfo().taskId);

                }

                if (mRecentTasks.isPresent() && sideChild != null) {

                    mRecentTasks.get().removeSplitPair(sideChild.getTaskInfo().taskId);

                }

                mSplitUnsupportedToast.show();

                return true;

            }