summaryrefslogtreecommitdiffstats
path: root/core/java/com
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2009-05-27 15:29:04 -0700
committerAmith Yamasani <yamasani@google.com>2009-05-27 15:29:04 -0700
commitc33fe6c9a71008d51aab7775532d73a3eaf12370 (patch)
treede6e249c16766debf253d0e8bb83e5471979bcae /core/java/com
parentd185cac23ccda47d73110d0bdf3c23434ee76340 (diff)
downloadframeworks_base-c33fe6c9a71008d51aab7775532d73a3eaf12370.zip
frameworks_base-c33fe6c9a71008d51aab7775532d73a3eaf12370.tar.gz
frameworks_base-c33fe6c9a71008d51aab7775532d73a3eaf12370.tar.bz2
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.
Diffstat (limited to 'core/java/com')
-rw-r--r--core/java/com/android/internal/os/BatteryStatsImpl.java4
1 files changed, 3 insertions, 1 deletions
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 @@ public final class BatteryStatsImpl extends BatteryStats {
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 @@ public final class BatteryStatsImpl extends BatteryStats {
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);