diff options
| author | Adam Bookatz <bookatz@google.com> | 2020-04-02 18:42:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-04-02 18:42:07 +0000 |
| commit | 2f559add63f0fa0de5be4deb3ffad0bb73ba7e52 (patch) | |
| tree | cba170b2112aee56b70a073246314c0f6d18cc46 /core/java | |
| parent | b164ea9d7ab9d1e9771069310f919e408c43ccee (diff) | |
| parent | 9b6d51e688f11d9b0c75d1cef8761589a87b2cac (diff) | |
Merge "Avoid getUserBadgeNoBackgroundResId if no badge" into rvc-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/ApplicationPackageManager.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java index a1ec27b3e9f7..f883b60b534f 100644 --- 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)); |