1 files changed, 6 insertions, 0 deletions
diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java
index 77649f0..1218fe3 100644
--- a/core/java/com/android/internal/os/BatteryStatsImpl.java
+++ b/core/java/com/android/internal/os/BatteryStatsImpl.java
@@ -2360,6 +2360,12 @@ public final class BatteryStatsImpl extends BatteryStats {
     public void updateKernelWakelocksLocked() {
         Map<String, KernelWakelockStats> m = readKernelWakelockStats();
         
+        if (m == null) {
+            // Not crashing might make board bringup easier.
+            Log.w(TAG, "Couldn't get kernel wake lock stats");
+            return;
+        }
+
         for (Map.Entry<String, KernelWakelockStats> ent : m.entrySet()) {
             String name = ent.getKey();
             KernelWakelockStats kws = ent.getValue();