Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ia911fe0f41a537f400b0c5de6713d5f4a6d4c9d7
This commit is contained in:
Winson Chung
2021-11-24 06:24:21 +00:00
committed by Automerger Merge Worker
parent 3ff5002d38 6eb2fbbe3c
commit bcaa34d13f
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -291,8 +291,10 @@ class AppPair implements ShellTaskOrganizer.TaskListener, SplitLayout.SplitLayou
final String innerPrefix = prefix + " "; final String innerPrefix = prefix + " ";
final String childPrefix = innerPrefix + " "; final String childPrefix = innerPrefix + " ";
pw.println(prefix + this); pw.println(prefix + this);
pw.println(innerPrefix + "Root taskId=" + getRootTaskId() if (mRootTaskInfo != null) {
+ " winMode=" + mRootTaskInfo.getWindowingMode()); pw.println(innerPrefix + "Root taskId=" + mRootTaskInfo.taskId
+ " winMode=" + mRootTaskInfo.getWindowingMode());
}
if (mTaskInfo1 != null) { if (mTaskInfo1 != null) {
pw.println(innerPrefix + "1 taskId=" + mTaskInfo1.taskId pw.println(innerPrefix + "1 taskId=" + mTaskInfo1.taskId
+ " winMode=" + mTaskInfo1.getWindowingMode()); + " winMode=" + mTaskInfo1.getWindowingMode());