Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Avoid getUserBadgeNoBackgroundResId if no badge" into rvc-dev

Browse Source
This commit is contained in:
Adam Bookatz
2020-04-02 18:42:07 +00:00
committed by Android (Google) Code Review
parent b164ea9d7a 9b6d51e688
commit 2f559add63
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/app/ApplicationPackageManager.java
View File

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