From 8af9940f4c9461ce8ed2276bbd6d1b02265fe78b Mon Sep 17 00:00:00 2001
From: Fengjiang Li <fengjial@google.com>
Date: Tue, 7 Mar 2023 16:22:56 -0800
Subject: [PATCH] Fix NPE of TopTaskTracker

Fix: b/270602014
Test: manual
Change-Id: Ifdfedee45edea521cb60dad2b41823b9964e8c11
---
 quickstep/src/com/android/quickstep/TopTaskTracker.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/TopTaskTracker.java b/quickstep/src/com/android/quickstep/TopTaskTracker.java
index 6d8ee104fb..6f502d0ece 100644
--- a/quickstep/src/com/android/quickstep/TopTaskTracker.java
+++ b/quickstep/src/com/android/quickstep/TopTaskTracker.java
@@ -302,7 +302,10 @@ public class TopTaskTracker extends ISplitScreenListener.Stub implements TaskSta
 
         @Nullable
         public String getPackageName() {
-            return mTopTask == null ? null : mTopTask.baseActivity.getPackageName();
+            if (mTopTask == null || mTopTask.baseActivity == null) {
+                return null;
+            }
+            return mTopTask.baseActivity.getPackageName();
         }
     }
 }