PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix issues #16941902, #16901402, and #16135174." into lmp-dev

Browse Source
This commit is contained in:
Dianne Hackborn
2014-08-27 23:35:04 +00:00
committed by Android (Google) Code Review
parent ebcce2088a be300225df
commit 6d1297ed1a
4 changed files with 134 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/fuelgauge/PowerUsageSummary.java
View File

@@ -112,6 +112,12 @@ public class PowerUsageSummary extends PreferenceFragment {
setHasOptionsMenu(true);
}
@Override
public void onStart() {
super.onStart();
mStatsHelper.clearStats();
}
@Override
public void onResume() {
super.onResume();
@@ -250,7 +256,8 @@ public class PowerUsageSummary extends PreferenceFragment {
mAppListGroup.addPreference(mHistPref);
boolean addedSome = false;
PowerProfile powerProfile = mStatsHelper.getPowerProfile();
final PowerProfile powerProfile = mStatsHelper.getPowerProfile();
final BatteryStats stats = mStatsHelper.getStats();
final double averagePower = powerProfile.getAveragePower(PowerProfile.POWER_SCREEN_FULL);
if (averagePower >= MIN_AVERAGE_POWER_THRESHOLD_MILLI_AMP) {
final List<UserHandle> profiles = mUm.getUserProfiles();
@@ -259,7 +266,7 @@ public class PowerUsageSummary extends PreferenceFragment {
final List<BatterySipper> usageList = mStatsHelper.getUsageList();
final int dischargeAmount = mStatsHelper.getStats().getDischargeAmount(mStatsType);
final int dischargeAmount = stats != null ? stats.getDischargeAmount(mStatsType) : 0;
final int numSippers = usageList.size();
for (int i = 0; i < numSippers; i++) {
final BatterySipper sipper = usageList.get(i);