Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c12891f authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Fix pip enter crash in landscape split-screen pair" into main am: 09bbb6e6 am: 77f497fb 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3394139



Change-Id: I7514b66726d244c53b0251ea95bed1dce467572a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 05557432 77f497fb

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

+2 −1
Original line number Diff line number Diff line
@@ -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;

                }