Merge "Avoid getUserBadgeNoBackgroundResId if no badge" into rvc-dev am: 2f559add63 am: 81ed507cfe

Change-Id: I63b955fe6f0139b670b85b78c275e6d220e8a8f1
2020-04-02 19:21:08 +00:00
parent 3dccc387fc 81ed507cfe
commit cf459fbbb4
1 changed files with 4 additions and 1 deletions
--- a/core/java/android/app/ApplicationPackageManager.java
+++ b/core/java/android/app/ApplicationPackageManager.java
@@ -1610,7 +1610,10 @@ public class ApplicationPackageManager extends PackageManager {

    @Override
    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);
        if (badge != null) {
            badge.setTint(getUserBadgeColor(user));