Merge \\"Prevent early boot crash reading PowerProfile\\" into nyc-dev am: ec6db57ac7 (965ed117) · Commits · e / os / android_frameworks_base

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;