diff options
| author | 2021-11-24 05:32:43 +0000 | |
|---|---|---|
| committer | 2021-11-24 05:32:43 +0000 | |
| commit | e39da5a9a773e62f4528c10e01cc9fb698ae8497 (patch) | |
| tree | 433912fadcfa047d532ee7cb84fbbaca636d380e | |
| parent | f7e97bd385989699d3f22394cc4b271aa1cc0de3 (diff) | |
| parent | 678fdc8acda54028a48905c48de433ce1c28c6a0 (diff) | |
Merge "Add null check for mRootTaskInfo in AppPair dump"
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/apppairs/AppPair.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/apppairs/AppPair.java b/libs/WindowManager/Shell/src/com/android/wm/shell/apppairs/AppPair.java index e6d088e6537d..2adf8ce8525f 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/apppairs/AppPair.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/apppairs/AppPair.java @@ -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()); |