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

Commit 0cd0b186 authored by Alexandra Gherghina's avatar Alexandra Gherghina Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE from empty PackageInfo" into lmp-dev

parents e23b8dd5 db811dbc

core/java/android/app/ApplicationPackageManager.java

+4 −1
Original line number Diff line number Diff line
@@ -1640,7 +1640,10 @@ final class ApplicationPackageManager extends PackageManager { 
        if (itemInfo.showUserIcon != UserHandle.USER_NULL) {

            return new BitmapDrawable(getUserManager().getUserIcon(itemInfo.showUserIcon));

        }

        Drawable dr = getDrawable(itemInfo.packageName, itemInfo.icon, appInfo);

        Drawable dr = null;

        if (itemInfo.packageName != null) {

            dr = getDrawable(itemInfo.packageName, itemInfo.icon, appInfo);

        }

        if (dr == null) {

            dr = itemInfo.loadDefaultIcon(this);

        }