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 am: 31ef27c249

Browse Source 
am: 965ed1170b

Change-Id: I076e5933a1cd3f93fedd044c835b790e0ad11818
This commit is contained in:
Adam Lesinski
2016-06-22 17:47:02 +00:00
committed by android-build-merger
parent 6c3af7cc45 965ed1170b
commit 122cbd1705
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;