Merge "Never fetch notification badges for USER_SYSTEM" into nyc-dev

2016-05-23 17:44:14 +00:00
parent 5ee420c0d5 66619a2ea1
commit 0a9ccf2619
1 changed files with 5 additions and 0 deletions
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -3106,6 +3106,11 @@ public class Notification implements Parcelable
        }

        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
            // originating user.
            return mContext.getPackageManager().getUserBadgeForDensityNoBackground(