commit 85968ae57413bfd7fdf3f56a672db6f8bdf9a468
author Treehugger Robot <treehugger-gerrit@google.com> Mon Feb 14 14:55:10 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Feb 14 14:55:10 2022 +0000
tree 91ec3ff04cc56aa09dc24398e7c7e9d0cf625818
parent d2101ad4013bbe8dfaba033044fdeb12996137fb
parent 76665a649893ed8a1118190c98f489e1ab89adc5

Merge "Add null check after getApplicationInfo in InstantAppNotifier" am: 56d6691e8e am: f5d40d9afa am: 76665a6498

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1890539

Change-Id: Ie24e49a38edc8e4913f285e2347a5955b6b1b596

packages/SystemUI/src/com/android/systemui/statusbar/notification/InstantAppNotifier.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/InstantAppNotifier.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/InstantAppNotifier.java
index 60d1317..82b56cd 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/InstantAppNotifier.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/InstantAppNotifier.java
@@ -234,7 +234,7 @@
                 ApplicationInfo appInfo =
                         pm.getApplicationInfo(
                                 pkg, PackageManager.MATCH_UNINSTALLED_PACKAGES, info.userId);
-                if (appInfo.isInstantApp()) {
+                if (appInfo != null && appInfo.isInstantApp()) {
                     postInstantAppNotif(
                             pkg,
                             info.userId,