From aeacd49f29099db51b64d968307f795b909c5e80 Mon Sep 17 00:00:00 2001
From: Beverly <beverlyt@google.com>
Date: Tue, 21 Dec 2021 16:15:46 -0500
Subject: [PATCH] Prevent NPE when checking toast icon label

Test: manual
Fixes: 210971093
Change-Id: I8eb15dcb6ab71c5f3e91a7dae08adaaaa5e60ab2
---
 .../src/com/android/systemui/toast/SystemUIToast.java         | 4 +++-
 1 file changed, 3 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 97fce515d87ea..525db3e3507f6 100644
--- a/packages/SystemUI/src/com/android/systemui/toast/SystemUIToast.java
+++ b/packages/SystemUI/src/com/android/systemui/toast/SystemUIToast.java
@@ -199,7 +199,9 @@ public class SystemUIToast implements ToastPlugin.Toast {
                 iconView.setVisibility(View.GONE);
             } else {
                 iconView.setImageDrawable(icon);
-                if (appInfo.labelRes != 0) {
+                if (appInfo == null) {
+                    Log.d(TAG, "No appInfo for pkg=" + mPackageName + " usr=" + mUserId);
+                } else if (appInfo.labelRes != 0) {
                     try {
                         Resources res = mContext.getPackageManager().getResourcesForApplication(
                                 appInfo,