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

Commit 6b88dadc authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Add null check for mRootTaskInfo in AppPair dump" am: e39da5a9 

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

Change-Id: Ifd160aed0f9e192507752d7bffb30195a0164d5f
parents 72b5ecde e39da5a9

libs/WindowManager/Shell/src/com/android/wm/shell/apppairs/AppPair.java

+4 −2
Original line number Diff line number Diff line
@@ -272,8 +272,10 @@ class AppPair implements ShellTaskOrganizer.TaskListener, SplitLayout.SplitLayou 
        final String innerPrefix = prefix + "  ";

        final String childPrefix = innerPrefix + "  ";

        pw.println(prefix + this);

        pw.println(innerPrefix + "Root taskId=" + getRootTaskId()

        if (mRootTaskInfo != null) {

            pw.println(innerPrefix + "Root taskId=" + mRootTaskInfo.taskId

                    + " winMode=" + mRootTaskInfo.getWindowingMode());

        }

        if (mTaskInfo1 != null) {

            pw.println(innerPrefix + "1 taskId=" + mTaskInfo1.taskId

                    + " winMode=" + mTaskInfo1.getWindowingMode());