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

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

Browse Source 
am: 89046edb4d

* commit '89046edb4d64fe1c7662103cce3a82b69e05cfe4':
  Fix issue where max idle time > total idle time

Change-Id: Idfbfa60ec62002712073ae9af3c3e4c0e39be1e7
This commit is contained in:
Adam Lesinski
2016-05-27 01:52:32 +00:00
committed by android-build-merger
parent 63014c5f6c 89046edb4d
commit 7e762beb7f
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() { private void resetAllStatsLocked() {
final long uptimeMillis = mClocks.uptimeMillis();
final long elapsedRealtimeMillis = mClocks.elapsedRealtime();
mStartCount = 0; mStartCount = 0;
initTimes(mClocks.uptimeMillis() * 1000, mClocks.elapsedRealtime() * 1000); initTimes(uptimeMillis * 1000, elapsedRealtimeMillis * 1000);
mScreenOnTimer.reset(false); mScreenOnTimer.reset(false);
for (int i=0; i<NUM_SCREEN_BRIGHTNESS_BINS; i++) { for (int i=0; i<NUM_SCREEN_BRIGHTNESS_BINS; i++) {
mScreenBrightnessTimer[i].reset(false); mScreenBrightnessTimer[i].reset(false);
} }
mInteractiveTimer.reset(false); mInteractiveTimer.reset(false);
mPowerSaveModeEnabledTimer.reset(false); mPowerSaveModeEnabledTimer.reset(false);
mLastIdleTimeStart = elapsedRealtimeMillis;
mLongestLightIdleTime = 0; mLongestLightIdleTime = 0;
mLongestFullIdleTime = 0; mLongestFullIdleTime = 0;
mDeviceIdleModeLightTimer.reset(false); mDeviceIdleModeLightTimer.reset(false);