Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Prevent NPE when checking toast icon label" into sc-v2-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-01-05 16:07:27 +00:00
committed by Android (Google) Code Review
parent b92bc42153 d30f4c67d9
commit 8db70a3619
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/toast/SystemUIToast.java
View File

@@ -200,7 +200,9 @@ public class SystemUIToast implements ToastPlugin.Toast {
iconView.setVisibility(View.GONE); iconView.setVisibility(View.GONE);
} else { } else {
iconView.setImageDrawable(icon); 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 { try {
Resources res = mContext.getPackageManager().getResourcesForApplication( Resources res = mContext.getPackageManager().getResourcesForApplication(
appInfo, appInfo,