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

Commit 1a76a62b authored by Adam Lesinski's avatar Adam Lesinski
Browse files

Prevent early boot crash reading PowerProfile 

The PowerProfile in BatteryStatsImpl may not be ready when
resetting stats early in the boot sequence.

Bug:29559031
Change-Id: I51bba762231a08804f1b68505bb1b0523476081d
parent f184789a

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;