commit 9b2be9e4ebbbeca83d81482cda6783cc7e2ac32b
author Adam Lesinski <adamlesinski@google.com> Wed Jun 22 10:28:47 2016 -0700
committer The Android Automerger <android-build@google.com> Wed Jun 22 14:41:48 2016 -0700
tree 275c0d0b99b5e5acb8d8f8ae3f363d9dd7cc5c7b
parent 2243ac74825137f927de476973a79f2811dda725

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

core/java/com/android/internal/os/BatteryStatsImpl.java

diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java
index f853e04..a1df8c1 100644
--- a/core/java/com/android/internal/os/BatteryStatsImpl.java
+++ b/core/java/com/android/internal/os/BatteryStatsImpl.java
@@ -8186,7 +8186,12 @@
         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;