Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 31ef27c249

Change-Id: I370e3d0caacae88865ad26d0ef6049ba2abd774c
This commit is contained in:
Adam Lesinski
2016-06-22 17:41:15 +00:00
committed by android-build-merger
parent 20b97a2cd9 31ef27c249
commit 965ed1170b
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/com/android/internal/os/BatteryStatsImpl.java
View File

@@ -8186,7 +8186,12 @@ public class BatteryStatsImpl extends BatteryStats {
for (int i=0; i<NUM_SCREEN_BRIGHTNESS_BINS; i++) {
mScreenBrightnessTimer[i].reset(false);
}
mEstimatedBatteryCapacity = (int) mPowerProfile.getBatteryCapacity();
if (mPowerProfile != null) {
mEstimatedBatteryCapacity = (int) mPowerProfile.getBatteryCapacity();
} else {
mEstimatedBatteryCapacity = -1;
}
mInteractiveTimer.reset(false);
mPowerSaveModeEnabledTimer.reset(false);
mLastIdleTimeStart = elapsedRealtimeMillis;