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

Commit 337c3cd6 authored by Liran Binyamin's avatar Liran Binyamin Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in StageCoordinator.dump" into main

parents 46ec133f 7f2fb731

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

+13 −7
Original line number Diff line number Diff line
@@ -4157,13 +4157,19 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
        pw.println(innerPrefix + "isSplitVisible=" + isSplitScreenVisible());

        pw.println(innerPrefix + "isLeftRightSplit="

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

        pw.println(innerPrefix + "MainStage");

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

        pw.println(childPrefix + "isActive=" + isSplitActive());

        if (mMainStage != null) {

            pw.println(innerPrefix + "MainStage");

            pw.println(

                    childPrefix + "stagePosition=" + splitPositionToString(getMainStagePosition()));

            mMainStage.dump(pw, childPrefix);

        }

        if (mSideStage != null) {

            pw.println(innerPrefix + "SideStage");

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

            pw.println(

                    childPrefix + "stagePosition=" + splitPositionToString(getSideStagePosition()));

            mSideStage.dump(pw, childPrefix);

        }

        if (mSplitLayout != null) {

            mSplitLayout.dump(pw, childPrefix);

        }