commit c523de6dc231b662602375f46d12a8f5d3e31e00
author Fengjiang Li <fengjial@google.com> Thu Mar 09 18:25:07 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 09 18:25:07 2023 +0000
tree e67ec0d47991ffc6a810e0c71d61c915ee8f25fd
parent c1e12fc15005522e94474c7419675ccfd6b4f94f
parent 8af9940f4c9461ce8ed2276bbd6d1b02265fe78b

Merge "Fix NPE of TopTaskTracker" into tm-qpr-dev

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();
         }
     }
 }