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

Commit f19a3237 authored by Winson Chung's avatar Winson Chung
Browse files

Add null checks for split layout before dumping 

Flag: EXEMPT bugfix
Fixes: 338658625
Test: dumpsys activity service SystemUIService
Change-Id: I89461a2f73cbad56aaa547314b67bee43e60ba7e
parent 5627a898

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

+5 −2
Original line number Diff line number Diff line
@@ -3556,7 +3556,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());
@@ -3568,7 +3569,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);

        }