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

Merge "Merge "Fix issue where max idle time > total idle time" into nyc-dev am: 89046edb4d am: fc7c27b215" into nyc-mr1-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2016-05-27 03:55:24 +00:00
committed by Android (Google) Code Review
parent 7f65fca112 408002879c
commit 0c67994e33
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/com/android/internal/os/BatteryStatsImpl.java
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);