Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ddacd0f7 authored by Adam Lesinski's avatar Adam Lesinski Committed by android-build-merger
Browse files

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

Merge "Merge "Fix issue where max idle time > total idle time" into nyc-dev am: 89046edb am: fc7c27b2" into nyc-mr1-dev-plus-aosp
am: 0c67994e

* commit '0c67994e':
  Fix issue where max idle time > total idle time

Change-Id: Ia9cf5c89afc542f14ac3ca664e8a2baa0f3d1218
parents fb959b7b 0c67994e

core/java/com/android/internal/os/BatteryStatsImpl.java

+4 −1
Original line number Diff line number Diff line
@@ -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);