From 4bd8a2fb9c3fb574cc0bf1827908da7c4a9cede4 Mon Sep 17 00:00:00 2001 From: Beverly Date: Mon, 29 Mar 2021 08:41:16 -0400 Subject: [PATCH] Don't show a toast icon if app.info is null To avoid NPE if appEntry.info doesn't exist yet. Test: manual Fixes: 183791632 Change-Id: Ie3933c20d590daac940bd23e134f9b3d1f895e39 --- .../SystemUI/src/com/android/systemui/toast/SystemUIToast.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/toast/SystemUIToast.java b/packages/SystemUI/src/com/android/systemui/toast/SystemUIToast.java index 3892f310e6697..662e25c668eea 100644 --- a/packages/SystemUI/src/com/android/systemui/toast/SystemUIToast.java +++ b/packages/SystemUI/src/com/android/systemui/toast/SystemUIToast.java @@ -233,7 +233,8 @@ public class SystemUIToast implements ToastPlugin.Toast { return null; } final AppEntry appEntry = appState.getEntry(packageName, userId); - if (!ApplicationsState.FILTER_DOWNLOADED_AND_LAUNCHER.filterApp(appEntry)) { + if (appEntry.info == null + || !ApplicationsState.FILTER_DOWNLOADED_AND_LAUNCHER.filterApp(appEntry)) { return null; }