From 262f671df8048ed201cd534abcb27f12257cdb7e Mon Sep 17 00:00:00 2001
From: Jeff Chang <chengjeff@google.com>
Date: Thu, 9 Sep 2021 18:14:52 +0800
Subject: [PATCH] Fix NPE when get organized taskFragment

NPE happens occasionally during SST, Was not checking if parent
was null.

Bug: 199146679
Test: atest TaskFragmentOrganizerTest
      TaskFragmentOrganizerPolicyTest
Change-Id: I54dc4fc3c789d5c87fd1480906d6736106877e25
---
 services/core/java/com/android/server/wm/TaskFragment.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/TaskFragment.java b/services/core/java/com/android/server/wm/TaskFragment.java
index 7c939e67077ce..8fdda8be01966 100644
--- a/services/core/java/com/android/server/wm/TaskFragment.java
+++ b/services/core/java/com/android/server/wm/TaskFragment.java
@@ -441,7 +441,7 @@ class TaskFragment extends WindowContainer<WindowContainer> {
             return this;
         }
 
-        TaskFragment parentTaskFragment = getParent().asTaskFragment();
+        TaskFragment parentTaskFragment = getParent() != null ? getParent().asTaskFragment() : null;
         return parentTaskFragment != null ? parentTaskFragment.getOrganizedTaskFragment() : null;
     }