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

am: f9f6d64ed8

* commit 'f9f6d64ed8406dc6417cc88c9e49d68d45c3773a':
  Never fetch notification badges for USER_SYSTEM

Change-Id: I25e158bfe98d4bca60a7e460b6c6bd6784caade0

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(