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

Merge "Never fetch notification badges for USER_SYSTEM" into nyc-dev am: 0a9ccf2619

Browse Source 
am: 688ebc6f75

* commit '688ebc6f753ad574e1e2ca3f67acf592abe53d5c':
  Never fetch notification badges for USER_SYSTEM

Change-Id: I8492b9148b66b9aef69362b10de10ef8f991ecc7
This commit is contained in:
Chris Wren
2016-05-23 17:53:25 +00:00
committed by android-build-merger
parent a418a9f11a 688ebc6f75
commit f9f6d64ed8
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3106,6 +3106,11 @@ public class Notification implements Parcelable
} }
private Drawable getProfileBadgeDrawable() { private Drawable getProfileBadgeDrawable() {
if (mContext.getUserId() == UserHandle.USER_SYSTEM) {
// This user can never be a badged profile,
// and also includes USER_ALL system notifications.
return null;
}
// Note: This assumes that the current user can read the profile badge of the // Note: This assumes that the current user can read the profile badge of the
// originating user. // originating user.
return mContext.getPackageManager().getUserBadgeForDensityNoBackground( return mContext.getPackageManager().getUserBadgeForDensityNoBackground(