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

Merge "Null check ApplicationInfo for ApplicationPackageManager#loadUnbadgedItemIcon" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-05-10 18:46:49 +00:00
committed by Android (Google) Code Review
parent 6198fed9be 4160523864
commit 04d00184cc
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/app/ApplicationPackageManager.java
View File

@@ -2751,7 +2751,8 @@ public class ApplicationPackageManager extends PackageManager {
/**
* @hide
*/
public Drawable loadUnbadgedItemIcon(PackageItemInfo itemInfo, ApplicationInfo appInfo) {
public Drawable loadUnbadgedItemIcon(@NonNull PackageItemInfo itemInfo,
@Nullable ApplicationInfo appInfo) {
if (itemInfo.showUserIcon != UserHandle.USER_NULL) {
Bitmap bitmap = getUserManager().getUserIcon(itemInfo.showUserIcon);
if (bitmap == null) {
@@ -2764,7 +2765,7 @@ public class ApplicationPackageManager extends PackageManager {
if (itemInfo.packageName != null) {
dr = getDrawable(itemInfo.packageName, itemInfo.icon, appInfo);
}
if (dr == null && itemInfo != appInfo) {
if (dr == null && itemInfo != appInfo && appInfo != null) {
dr = loadUnbadgedItemIcon(appInfo, appInfo);
}
if (dr == null) {