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

Commit 0c67994e authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
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
parents 7f65fca1 40800287
Loading
Loading
Loading
Loading
+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);