Merge "Fix refresh issue of badged icons in Battery Settings" into lmp-dev
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index a691d4d..3ce2ac0 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -332,7 +332,9 @@
                             (PowerGaugePreference) findPreference(
                                     Integer.toString(entry.sipper.uidObj.getUid()));
                     if (pgp != null) {
-                        pgp.setIcon(entry.icon);
+                        final int userId = UserHandle.getUserId(entry.sipper.getUid());
+                        final UserHandle userHandle = new UserHandle(userId);
+                        pgp.setIcon(mUm.getBadgedDrawableForUser(entry.getIcon(), userHandle));
                         pgp.setTitle(entry.name);
                     }
                     break;