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

Commit 9b6d51e6 authored by Adam Bookatz's avatar Adam Bookatz
Browse files

Avoid getUserBadgeNoBackgroundResId if no badge 

Checks whether there actually is a badge before
calling getUserBadgeNoBackgroundResId.
(Otherwise a logcat error would have been logged, since
it is only expected to be called if there is indeed
a badge.)

Test: manual confirmation that logcat error is gone
Bug: 142482943
Change-Id: I635529d9c114b399e5626bdbb143aab29ae81a4b
parent c7063617

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