Merge "Null check ApplicationInfo for ApplicationPackageManager#loadUnbadgedItemIcon" into qt-dev (04d00184) · Commits · e / os / android_frameworks_base

core/java/android/app/ApplicationPackageManager.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -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) {