Merge "Pull pref summaries from power usage summary" into nyc-dev am: 3cd935c

am: 4a0c449

* commit '4a0c449ade858a12f18fb03d14115852067a4403':
  Pull pref summaries from power usage summary

Change-Id: I80f9ee746cabf2c3ad9dcfd441fa37d6590963ea
This commit is contained in:
Jason Monk
2016-04-11 14:32:32 +00:00
committed by android-build-merger

View File

@@ -279,7 +279,6 @@ public class PowerUsageSummary extends PowerUsageBase {
protected void refreshStats() {
super.refreshStats();
PowerWhitelistBackend powerWhiteist = PowerWhitelistBackend.getInstance();
updatePreference(mHistPref);
cacheRemoveAllPrefs(mAppListGroup);
mAppListGroup.setOrderingAsAdded(false);
@@ -360,12 +359,6 @@ public class PowerUsageSummary extends PowerUsageBase {
pref.setTitle(entry.getLabel());
pref.setOrder(i + 1);
pref.setPercent(percentOfMax, percentOfTotal);
if (sipper.drainType == DrainType.APP) {
pref.setSummary(powerWhiteist.isWhitelisted(entry.defaultPackageName)
|| powerWhiteist.isSysWhitelisted(entry.defaultPackageName)
? getString(R.string.not_battery_optimizing)
: null);
}
if (sipper.uidObj != null) {
pref.setKey(Integer.toString(sipper.uidObj.getUid()));
}