Merge "Fix issue where max idle time > total idle time" into nyc-dev

This commit is contained in:
Adam Lesinski
2016-05-27 01:44:31 +00:00
committed by Android (Google) Code Review

View File

@@ -8153,14 +8153,17 @@ public class BatteryStatsImpl extends BatteryStats {
}
private void resetAllStatsLocked() {
final long uptimeMillis = mClocks.uptimeMillis();
final long elapsedRealtimeMillis = mClocks.elapsedRealtime();
mStartCount = 0;
initTimes(mClocks.uptimeMillis() * 1000, mClocks.elapsedRealtime() * 1000);
initTimes(uptimeMillis * 1000, elapsedRealtimeMillis * 1000);
mScreenOnTimer.reset(false);
for (int i=0; i<NUM_SCREEN_BRIGHTNESS_BINS; i++) {
mScreenBrightnessTimer[i].reset(false);
}
mInteractiveTimer.reset(false);
mPowerSaveModeEnabledTimer.reset(false);
mLastIdleTimeStart = elapsedRealtimeMillis;
mLongestLightIdleTime = 0;
mLongestFullIdleTime = 0;
mDeviceIdleModeLightTimer.reset(false);