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

Commit bcaa34d1 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 am:... 

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

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

Change-Id: Ia911fe0f41a537f400b0c5de6713d5f4a6d4c9d7
parents 3ff5002d 6eb2fbbe

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

+4 −2
Original line number Diff line number Diff line
@@ -291,8 +291,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());