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

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

Merge \\\"Prevent early boot crash reading PowerProfile\\\" into nyc-dev am:... 

Merge \\\"Prevent early boot crash reading PowerProfile\\\" into nyc-dev am: ec6db57a am: 31ef27c2
am: 965ed117

Change-Id: I076e5933a1cd3f93fedd044c835b790e0ad11818
parents 6c3af7cc 965ed117

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

+6 −1
Original line number Diff line number Diff line
@@ -8186,7 +8186,12 @@ public class BatteryStatsImpl extends BatteryStats { 
        for (int i=0; i<NUM_SCREEN_BRIGHTNESS_BINS; i++) {

            mScreenBrightnessTimer[i].reset(false);

        }



        if (mPowerProfile != null) {

            mEstimatedBatteryCapacity = (int) mPowerProfile.getBatteryCapacity();

        } else {

            mEstimatedBatteryCapacity = -1;

        }

        mInteractiveTimer.reset(false);

        mPowerSaveModeEnabledTimer.reset(false);

        mLastIdleTimeStart = elapsedRealtimeMillis;