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

Commit d8f6ddb2 authored by Matt Sziklay's avatar Matt Sziklay Committed by Android (Google) Code Review
Browse files

Merge "Add null checks to desktop split interactions." into main

parents 6279145c 728512c0

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

+6 −2
Original line number Diff line number Diff line
@@ -2832,8 +2832,12 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
            }

            callbackWct.setReparentLeafTaskIfRelaunch(mRootTaskInfo.token, false);

            mWindowDecorViewModel.ifPresent(viewModel -> {

                if (finalMainChild != null) {

                    viewModel.onTaskInfoChanged(finalMainChild.getTaskInfo());

                }

                if (finalSideChild != null) {

                    viewModel.onTaskInfoChanged(finalSideChild.getTaskInfo());

                }

            });

            mPausingTasks.clear();

        });

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java

+4 −2
Original line number Diff line number Diff line
@@ -1191,10 +1191,12 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { 
                                                : SPLIT_POSITION_TOP_OR_LEFT;

                                final RunningTaskInfo oppositeTaskInfo =

                                        mSplitScreenController.getTaskInfo(oppositePosition);

                                if (oppositeTaskInfo != null) {

                                    mWindowDecorByTaskId.get(oppositeTaskInfo.taskId)

                                            .disposeStatusBarInputLayer();

                                }

                            }

                        }

                        mMoveToDesktopAnimator = null;

                        return;

                    } else {