Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41605238 authored by Winson's avatar Winson
Browse files

Null check ApplicationInfo for ApplicationPackageManager#loadUnbadgedItemIcon 

Broken by I55026af543ff71ac0d947159bc6aeb3b33f31271 which added a shortcut.
Really caused by the method not being annotated correctly so it was
non-obvious that the AppInfo could be null.

Bug: 132078158

Test: atest PackageItemInfoIconTest

Change-Id: Ifd2789a80d2dad86ba4e09b1d9220ecab5d612ec
parent d7314d7a

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) {