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

Commit 08da7616 authored by Adam Bookatz's avatar Adam Bookatz Committed by Automerger Merge Worker
Browse files

Merge "Avoid getUserBadgeNoBackgroundResId if no badge" into rvc-dev am: 2f559add 

Change-Id: I703ba5f4dd669f4461aca1597763e4ba05336400
parents 6790d6b8 2f559add

core/java/android/app/ApplicationPackageManager.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -1610,7 +1610,10 @@ public class ApplicationPackageManager extends PackageManager { 




    @Override

    @Override

    public Drawable getUserBadgeForDensityNoBackground(UserHandle user, int density) {

    public Drawable getUserBadgeForDensityNoBackground(UserHandle user, int density) {

        Drawable badge = getProfileIconForDensity(user,

        if (!hasUserBadge(user.getIdentifier())) {

            return null;

        }

        Drawable badge = getDrawableForDensity(

                getUserManager().getUserBadgeNoBackgroundResId(user.getIdentifier()), density);

                getUserManager().getUserBadgeNoBackgroundResId(user.getIdentifier()), density);

        if (badge != null) {

        if (badge != null) {

            badge.setTint(getUserBadgeColor(user));

            badge.setTint(getUserBadgeColor(user));