diff options
| author | 2024-12-13 12:10:41 -0800 | |
|---|---|---|
| committer | 2024-12-13 12:10:41 -0800 | |
| commit | 5c12891fe1412b83d651da1c45e59916ee344ad7 (patch) | |
| tree | 1d3e717a41ac9edb9b15a0347be34ac25cb963ec | |
| parent | 05557432f99bdf8f7fd1f5c57eeb23183dd7fbc4 (diff) | |
| parent | 77f497fbf5cdb47228142c5c6f0d83d636107b0b (diff) | |
Merge "Fix pip enter crash in landscape split-screen pair" into main am: 09bbb6e6fb am: 77f497fbf5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3394139
Change-Id: I7514b66726d244c53b0251ea95bed1dce467572a
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 164dbe97c1f5..246760e361cd 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 @@ -3005,7 +3005,8 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, mSplitLayout.update(startTransaction, false /* resetImePosition */); } - if (mMixedHandler.isEnteringPip(change, transitType)) { + if (mMixedHandler.isEnteringPip(change, transitType) + && getSplitItemStage(change.getLastParent()) != STAGE_TYPE_UNDEFINED) { pipChange = change; } |