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

Prevent NPE when checking toast icon label

Browse Source 
Test: manual
Fixes: 210971093
Change-Id: I8eb15dcb6ab71c5f3e91a7dae08adaaaa5e60ab2
Merged-In: I8eb15dcb6ab71c5f3e91a7dae08adaaaa5e60ab2
(cherry picked from commit aeacd49f29)
This commit is contained in:
Beverly
2021-12-21 16:15:46 -05:00
committed by Beverly Tai
parent b09275f174
commit d30f4c67d9
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,