| commit | c01c5f8875be42e7b397b0dd46b35bb15c34804d | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Apr 10 07:08:44 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Apr 10 07:08:44 2023 +0000 |
| tree | 4d09fe5b77f34bef1213a923d391d14cc23c1137 | |
| parent | 305e0917c4a0869116fde11d82d6b04d0e766412 [diff] | |
| parent | b7d927c8811fd94d1e362bcc8e4906ed5ec798b3 [diff] |
Merge "Merge "Fix launch single task case if it under split roots" into tm-qpr-dev am: 09c1e20071" into tm-qpr-dev-plus-aosp am: b7d927c881 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22504283 Change-Id: I6e8838f08bf5c4bd86d28eff1451a7f8c9724bb9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java index dd91a37..04cb17c 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java
@@ -690,6 +690,10 @@ if (options1 == null) options1 = new Bundle(); if (taskId2 == INVALID_TASK_ID) { // Launching a solo task. + // Exit split first if this task under split roots. + if (mMainStage.containsTask(taskId1) || mSideStage.containsTask(taskId1)) { + exitSplitScreen(null /* childrenToTop */, EXIT_REASON_RECREATE_SPLIT); + } ActivityOptions activityOptions = ActivityOptions.fromBundle(options1); activityOptions.update(ActivityOptions.makeRemoteAnimation(adapter)); options1 = activityOptions.toBundle();