diff options
| author | Marco Nelissen <marcone@google.com> | 2009-04-30 14:45:06 -0700 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2009-04-30 14:48:49 -0700 |
| commit | d8593312296fd2193a070c1a074840d83b7f49cb (patch) | |
| tree | b8926aa90114aad11adfe03c3e408297576037a2 /core/java | |
| parent | 36742528f89fd13e65c8652cc684cffc9e97b567 (diff) | |
| download | frameworks_base-d8593312296fd2193a070c1a074840d83b7f49cb.zip frameworks_base-d8593312296fd2193a070c1a074840d83b7f49cb.tar.gz frameworks_base-d8593312296fd2193a070c1a074840d83b7f49cb.tar.bz2 | |
Don't crash when /proc/wakelocks can't be opened. Might make board bringup easier.
Verified with simulator, which doesn't have /proc/wakelocks
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/com/android/internal/os/BatteryStatsImpl.java | 6 |
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(); |