Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85a2fb07 authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am 145c989c: Merge change 2569 into donut 

Merge commit '145c989c'

* commit '145c989c':
  Fix a hang during bootup.
parents ba897243 145c989c

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

+3 −1
Original line number Diff line number Diff line
@@ -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);