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

Commit e97af033 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Exit split if one of the split is empty" into udc-dev am: 3c0b04f0 

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



Change-Id: I488ba7e582b05b2a7faa355a06a5c24e73c2ad8d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 44c715a8 3c0b04f0

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

+8 −3
Original line number Diff line number Diff line
@@ -2414,9 +2414,14 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
                }

            }

            if (mMainStage.getChildCount() == 0 || mSideStage.getChildCount() == 0) {

                // TODO(shell-transitions): Implement a fallback behavior for now.

                throw new IllegalStateException("Somehow removed the last task in a stage"

                        + " outside of a proper transition");

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

                        + "transition.");

                final WindowContainerTransaction wct = new WindowContainerTransaction();

                final int dismissTop = mMainStage.getChildCount() == 0

                        ? STAGE_TYPE_MAIN : STAGE_TYPE_SIDE;

                prepareExitSplitScreen(dismissTop, wct);

                mSplitTransitions.startDismissTransition(wct, this, dismissTop,

                        EXIT_REASON_UNKNOWN);

                // This can happen in some pathological cases. For example:

                // 1. main has 2 tasks [Task A (Single-task), Task B], side has one task [Task C]

                // 2. Task B closes itself and starts Task A in LAUNCH_ADJACENT at the same time