Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Only need to dismiss stage if one of the task is closed." into udc-dev

Browse Source
This commit is contained in:
Nataniel Borges
2023-04-21 13:19:50 +00:00
committed by Android (Google) Code Review
parent 4cf1607275 496fd6a64a
commit 54d018e1de
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2419,12 +2419,13 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
} }
} }
} }
// If the size of dismissStages > 0, the task is closed without prepare pending // If the size of dismissStages == 1, one of the task is closed without prepare pending
// transition, which could happen if all activities were finished after finish top // transition, which could happen if all activities were finished after finish top
// activity in a task, so the trigger task is null when handleRequest. // activity in a task, so the trigger task is null when handleRequest.
// Note if the size of dismissStages == 2, it's starting a new task, so don't handle it.
final ArraySet<StageTaskListener> dismissStages = record.getShouldDismissedStage(); final ArraySet<StageTaskListener> dismissStages = record.getShouldDismissedStage();
if (mMainStage.getChildCount() == 0 || mSideStage.getChildCount() == 0 if (mMainStage.getChildCount() == 0 || mSideStage.getChildCount() == 0
|| dismissStages.size() > 0) { || dismissStages.size() == 1) {
Log.e(TAG, "Somehow removed the last task in a stage outside of a proper " Log.e(TAG, "Somehow removed the last task in a stage outside of a proper "
+ "transition."); + "transition.");
final WindowContainerTransaction wct = new WindowContainerTransaction(); final WindowContainerTransaction wct = new WindowContainerTransaction();