Merge "Don't show a toast icon if app.info is null" into sc-dev

2021-03-30 17:26:44 +00:00
parent 77e7b86da4 4bd8a2fb9c
commit 42f5892237
1 changed files with 2 additions and 1 deletions
--- 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;
        }