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

Commit e0d45bf3 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Add null checks for split layout before dumping" into main

parents e093a605 f19a3237

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

+5 −2
Original line number Diff line number Diff line
@@ -3573,7 +3573,8 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
        pw.println(innerPrefix + "mDividerVisible=" + mDividerVisible);

        pw.println(innerPrefix + "isSplitActive=" + isSplitActive());

        pw.println(innerPrefix + "isSplitVisible=" + isSplitScreenVisible());

        pw.println(innerPrefix + "isLeftRightSplit=" + mSplitLayout.isLeftRightSplit());

        pw.println(innerPrefix + "isLeftRightSplit="

                + (mSplitLayout != null ? mSplitLayout.isLeftRightSplit() : "null"));

        pw.println(innerPrefix + "MainStage");

        pw.println(childPrefix + "stagePosition=" + splitPositionToString(getMainStagePosition()));

        pw.println(childPrefix + "isActive=" + mMainStage.isActive());
@@ -3585,7 +3586,9 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
        mSideStage.dump(pw, childPrefix);

        pw.println(innerPrefix + "SideStageListener");

        mSideStageListener.dump(pw, childPrefix);

        if (mSplitLayout != null) {

            mSplitLayout.dump(pw, childPrefix);

        }

        if (!mPausingTasks.isEmpty()) {

            pw.println(childPrefix + "mPausingTasks=" + mPausingTasks);

        }