am 3b521b60: Merge "Battery summary - tint uid 0 icon" into mnc-dev

* commit '3b521b60d3a1921b5231633105d1ca7afadd9978':
  Battery summary - tint uid 0 icon
This commit is contained in:
Jason Monk
2015-07-27 18:51:45 +00:00
committed by Android Git Automerger

View File

@@ -317,7 +317,8 @@ public class PowerUsageSummary extends PowerUsageBase {
if (sipper.uidObj != null) { if (sipper.uidObj != null) {
pref.setKey(Integer.toString(sipper.uidObj.getUid())); pref.setKey(Integer.toString(sipper.uidObj.getUid()));
} }
if (sipper.drainType != DrainType.APP && sipper.drainType != DrainType.USER) { if ((sipper.drainType != DrainType.APP || sipper.uidObj.getUid() == 0)
&& sipper.drainType != DrainType.USER) {
pref.setTint(colorControl); pref.setTint(colorControl);
} }
addedSome = true; addedSome = true;