diff options
| author | 2022-01-05 16:07:27 +0000 | |
|---|---|---|
| committer | 2022-01-05 16:07:27 +0000 | |
| commit | 8db70a36192511e53823ad8efe49f97ef18c42cf (patch) | |
| tree | 8b23df4ec7a57abfbb28c8a2db52617e8c6228f2 | |
| parent | b92bc42153beb28d7737a0c124f7a935efe429ae (diff) | |
| parent | d30f4c67d963532ebfa0c6bd438939861c1e6d1d (diff) | |
Merge "Prevent NPE when checking toast icon label" into sc-v2-dev
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/toast/SystemUIToast.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/toast/SystemUIToast.java b/packages/SystemUI/src/com/android/systemui/toast/SystemUIToast.java index 8b394bfe35b7..a3b29327f55a 100644 --- a/packages/SystemUI/src/com/android/systemui/toast/SystemUIToast.java +++ b/packages/SystemUI/src/com/android/systemui/toast/SystemUIToast.java @@ -200,7 +200,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, |