commit 8af9940f4c9461ce8ed2276bbd6d1b02265fe78b
author Fengjiang Li <fengjial@google.com> Tue Mar 07 16:22:56 2023 -0800
committer Fengjiang Li <fengjial@google.com> Tue Mar 07 16:23:32 2023 -0800
tree f652218e1aa073faba05ee66af49b7832e98f062
parent bd98aef4a4f15f75a94969bb364b1e272eeb4511

Fix NPE of TopTaskTracker

Fix: b/270602014
Test: manual
Change-Id: Ifdfedee45edea521cb60dad2b41823b9964e8c11

quickstep/src/com/android/quickstep/TopTaskTracker.java

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