commit c33fe6c9a71008d51aab7775532d73a3eaf12370
author Amith Yamasani <yamasani@google.com> Wed May 27 15:29:04 2009 -0700
committer Amith Yamasani <yamasani@google.com> Wed May 27 15:29:04 2009 -0700
tree de6e249c16766debf253d0e8bb83e5471979bcae
parent d185cac23ccda47d73110d0bdf3c23434ee76340

Fix a hang during bootup.

Some data was not being written to the battery stats during shutdown. So there was insufficient
data when reading back at bootup.

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 a448ac6..51f3b02 100644
--- a/core/java/com/android/internal/os/BatteryStatsImpl.java
+++ b/core/java/com/android/internal/os/BatteryStatsImpl.java
@@ -53,7 +53,7 @@
     private static final int MAGIC = 0xBA757475; // 'BATSTATS' 
 
     // Current on-disk Parcel version
-    private static final int VERSION = 36;
+    private static final int VERSION = 37;
 
     private final File mFile;
     private final File mBackupFile;
@@ -3014,6 +3014,8 @@
             
             u.mWifiTurnedOnTimer.writeSummaryFromParcelLocked(out, NOWREAL);
             u.mFullWifiLockTimer.writeSummaryFromParcelLocked(out, NOWREAL);
+            u.mAudioTurnedOnTimer.writeSummaryFromParcelLocked(out, NOWREAL);
+            u.mVideoTurnedOnTimer.writeSummaryFromParcelLocked(out, NOWREAL);
             u.mScanWifiLockTimer.writeSummaryFromParcelLocked(out, NOWREAL);
             u.mWifiMulticastTimer.writeSummaryFromParcelLocked(out, NOWREAL);