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 am: 8db70a3619

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16569869

Change-Id: Icb8f1aa66ad8430d5620654f22ad65f87597e201
This commit is contained in:
TreeHugger Robot
2022-01-05 16:23:21 +00:00
committed by Automerger Merge Worker
parent 9ccc5cffee 8db70a3619
commit 25547b7e67
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);
} 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,