Merge "Add null check for base activity" into sc-dev

2021-04-09 03:06:19 +00:00
parent 66a76544f2 dfb95187ff
commit 4a382d9547
1 changed files with 1 additions and 1 deletions
--- 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())) {