From dfb95187ffcd22816ccf366d6d410b234a9d95a9 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Thu, 8 Apr 2021 15:25:57 -0700
Subject: [PATCH] Add null check for base activity

Bug: 184870958
Test: Just a null check
Change-Id: Ib8dff1a1f319b216ce70732f5dfc444eac732637
---
 .../src/com/android/systemui/recents/RecentsOnboarding.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsOnboarding.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsOnboarding.java
index ccf2598e4f182..310ecbc01bf06 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/RecentsOnboarding.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsOnboarding.java
@@ -139,7 +139,7 @@ public class RecentsOnboarding {
         private void onAppLaunch() {
             ActivityManager.RunningTaskInfo info = ActivityManagerWrapper.getInstance()
                     .getRunningTask();
-            if (info == null) {
+            if (info == null || info.baseActivity == null) {
                 return;
             }
             if (mBlacklistedPackages.contains(info.baseActivity.getPackageName())) {