From 678fdc8acda54028a48905c48de433ce1c28c6a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kan=20Kvist?= <hakan.kvist@sony.com>
Date: Fri, 12 Nov 2021 13:34:19 +0100
Subject: [PATCH] Add null check for mRootTaskInfo in AppPair dump

mRootTaskInfo can be null, so make sure to check it before
accessing in AppPair dump method.

Bug: 206007135
Test: N/A
Change-Id: If012dedd80607af7a1e48512ddd4eaf2bebdc2bf
---
 .../Shell/src/com/android/wm/shell/apppairs/AppPair.java    | 6 ++++--
 1 file 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 e6d088e6537de..2adf8ce8525f9 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());