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

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

Change-Id: Ifd160aed0f9e192507752d7bffb30195a0164d5f
This commit is contained in:
Winson Chung
2021-11-24 05:50:50 +00:00
committed by Automerger Merge Worker

View File

@@ -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()
+ " winMode=" + mRootTaskInfo.getWindowingMode());
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());