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

Commit db811dbc authored by Alexandra Gherghina's avatar Alexandra Gherghina
Browse files

Fix NPE from empty PackageInfo 

Bug: 17325905
Change-Id: I38ae5e242b1bf615620cf069a2cccede6ee42125
parent 4c4e7964

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

        }