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

Commit 21ce7070 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: ec6db57a

Change-Id: Id0327572c549eff30dfe0a8fd70007bcaccf7a32
parents 183287c9 ec6db57a

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;