diff options
| author | 2023-06-06 01:35:42 +0000 | |
|---|---|---|
| committer | 2023-06-06 01:35:42 +0000 | |
| commit | a2f5366fcdcec43d5df13c90a28c4ab63f9f90ad (patch) | |
| tree | 12407a5f9f19b670c79a29d4e0860217e284f5c7 | |
| parent | d865e91fd8f6cff43034543b43075d8f6990d5df (diff) | |
| parent | 64d7bea91622ce5f17f9d2c0ee0c16626846ba5a (diff) | |
Merge "Fix not auto pip after swipe split pair to home" into udc-dev am: 64d7bea916
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23484433
Change-Id: Ieb7bcda8a89f5c21e6be1b2031abb222db037dcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java | 3 |
1 files changed, 2 insertions, 1 deletions
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 4ed4cf1fce2c..38911dbfc2b5 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 @@ -2907,7 +2907,8 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, } setSplitsVisible(false); - prepareExitSplitScreen(STAGE_TYPE_UNDEFINED, finishWct); + finishWct.setReparentLeafTaskIfRelaunch(mRootTaskInfo.token, + true /* reparentLeafTaskIfRelaunch */); logExit(EXIT_REASON_UNKNOWN); } |