Merge "Fix NPE of TopTaskTracker" into tm-qpr-dev am: c523de6dc2 am: b595d347a9

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21894262 Change-Id: I56b08140dd1385d2e8f9a1c7b1246453a873ab39 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09 19:35:09 +00:00
parent 0a42db6576 b595d347a9
commit b915b989df
1 changed files with 4 additions and 1 deletions
@@ -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();
        }
    }
 }