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

Commit aaa16c07 authored by Adam Bookatz's avatar Adam Bookatz Committed by android-build-merger
Browse files

Merge "loadUnbadgedItemIcon doesn't crash from getUserIcon" into qt-dev 

am: 14a34b9e

Change-Id: I96167fe68786a5269d2178d74c3bb4ffa1afca1c
parents 29d7f107 14a34b9e

core/java/android/app/ApplicationPackageManager.java

+5 −6
Original line number Diff line number Diff line
@@ -2754,12 +2754,11 @@ public class ApplicationPackageManager extends PackageManager { 
    public Drawable loadUnbadgedItemIcon(@NonNull PackageItemInfo itemInfo,

            @Nullable ApplicationInfo appInfo) {

        if (itemInfo.showUserIcon != UserHandle.USER_NULL) {

            Bitmap bitmap = getUserManager().getUserIcon(itemInfo.showUserIcon);

            if (bitmap == null) {

            // Indicates itemInfo is for a different user (e.g. a profile's parent), so use a 

            // generic user icon (users generally lack permission to view each other's actual icons)

            int targetUserId = itemInfo.showUserIcon;

            return UserIcons.getDefaultUserIcon(

                        mContext.getResources(), itemInfo.showUserIcon, /* light= */ false);

            }

            return new BitmapDrawable(bitmap);

                    mContext.getResources(), targetUserId, /* light= */ false);

        }

        Drawable dr = null;

        if (itemInfo.packageName != null) {

core/java/android/content/pm/PackageItemInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ public class PackageItemInfo { 
    public Bundle metaData;



    /**

     * If different of UserHandle.USER_NULL, The icon of this item will be the one of that user.

     * If different of UserHandle.USER_NULL, The icon of this item will represent that user.

     * @hide

     */

    public int showUserIcon;