Merge "Prevent NPE when checking toast icon label"

2021-12-22 19:34:19 +00:00
parent cf8a6227cc aeacd49f29
commit 4c9a0a0dca
1 changed files with 3 additions and 1 deletions
--- 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,