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

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

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

Change-Id: I8897f7a4082188ff3d175d8bfc832149eca4d0f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tony Huang
2023-07-12 07:31:28 +00:00
committed by Automerger Merge Worker
parent 44a8689f6a 593cc160ba
commit 68bc06afcf
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2564,6 +2564,9 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
// so don't handle it. // so don't handle it.
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.");
// 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 WindowContainerTransaction wct = new WindowContainerTransaction();
final int dismissTop = (dismissStages.size() == 1 final int dismissTop = (dismissStages.size() == 1
&& getStageType(dismissStages.valueAt(0)) == STAGE_TYPE_MAIN) && getStageType(dismissStages.valueAt(0)) == STAGE_TYPE_MAIN)
@@ -2747,6 +2750,12 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
Log.w(TAG, splitFailureMessage("startPendingEnterAnimation", Log.w(TAG, splitFailureMessage("startPendingEnterAnimation",
"launched 2 tasks in split, but didn't receive " "launched 2 tasks in split, but didn't receive "
+ "2 tasks in transition. Possibly one of them failed to launch")); + "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(); mSplitUnsupportedToast.show();
return true; return true;
} }