Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 30854356: am 29a11523: am c3014c8c: Merge "Fix issue #17705755: Battery stats resets at incorrect times" into lmp-dev

Browse Source 
* commit '30854356ef263a4e4ac3bd2376886f272d768e72':
  Fix issue #17705755: Battery stats resets at incorrect times
This commit is contained in:
Dianne Hackborn
2014-10-01 17:00:18 +00:00
committed by Android Git Automerger
parent ac5bb347cb 30854356ef
commit e83f322fa9
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/com/android/internal/os/BatteryStatsImpl.java
View File

@@ -6732,7 +6732,6 @@ public final class BatteryStatsImpl extends BatteryStats {
Message m = mHandler.obtainMessage(MSG_REPORT_POWER_CHANGE); Message m = mHandler.obtainMessage(MSG_REPORT_POWER_CHANGE);
m.arg1 = onBattery ? 1 : 0; m.arg1 = onBattery ? 1 : 0;
mHandler.sendMessage(m); mHandler.sendMessage(m);
mOnBattery = mOnBatteryInternal = onBattery;
final long uptime = mSecUptime * 1000; final long uptime = mSecUptime * 1000;
final long realtime = mSecRealtime * 1000; final long realtime = mSecRealtime * 1000;
@@ -6745,10 +6744,11 @@ public final class BatteryStatsImpl extends BatteryStats {
boolean reset = false; boolean reset = false;
if (!mNoAutoReset && (oldStatus == BatteryManager.BATTERY_STATUS_FULL if (!mNoAutoReset && (oldStatus == BatteryManager.BATTERY_STATUS_FULL
|| level >= 90 || level >= 90
|| getLowDischargeAmountSinceCharge() >= 60) || (mDischargeCurrentLevel < 20 && level >= 80)
|| (getHighDischargeAmountSinceCharge() >= 60 || (getHighDischargeAmountSinceCharge() >= 200
&& mHistoryBuffer.dataSize() >= MAX_HISTORY_BUFFER)) { && mHistoryBuffer.dataSize() >= MAX_HISTORY_BUFFER))) {
Slog.i(TAG, "Resetting battery stats: level=" + level + " status=" + oldStatus Slog.i(TAG, "Resetting battery stats: level=" + level + " status=" + oldStatus
+ " dischargeLevel=" + mDischargeCurrentLevel
+ " lowAmount=" + getLowDischargeAmountSinceCharge() + " lowAmount=" + getLowDischargeAmountSinceCharge()
+ " highAmount=" + getHighDischargeAmountSinceCharge()); + " highAmount=" + getHighDischargeAmountSinceCharge());
// Before we write, collect a snapshot of the final aggregated // Before we write, collect a snapshot of the final aggregated
@@ -6785,6 +6785,7 @@ public final class BatteryStatsImpl extends BatteryStats {
reset = true; reset = true;
mNumDischargeStepDurations = 0; mNumDischargeStepDurations = 0;
} }
mOnBattery = mOnBatteryInternal = onBattery;
mLastDischargeStepLevel = level; mLastDischargeStepLevel = level;
mMinDischargeStepLevel = level; mMinDischargeStepLevel = level;
mLastDischargeStepTime = -1; mLastDischargeStepTime = -1;
@@ -6812,6 +6813,7 @@ public final class BatteryStatsImpl extends BatteryStats {
mDischargeAmountScreenOff = 0; mDischargeAmountScreenOff = 0;
updateTimeBasesLocked(true, !screenOn, uptime, realtime); updateTimeBasesLocked(true, !screenOn, uptime, realtime);
} else { } else {
mOnBattery = mOnBatteryInternal = onBattery;
pullPendingStateUpdatesLocked(); pullPendingStateUpdatesLocked();
mHistoryCur.batteryLevel = (byte)level; mHistoryCur.batteryLevel = (byte)level;
mHistoryCur.states |= HistoryItem.STATE_BATTERY_PLUGGED_FLAG; mHistoryCur.states |= HistoryItem.STATE_BATTERY_PLUGGED_FLAG;