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

Commit 5e3357fc authored by Conley Owens's avatar Conley Owens
Browse files

Merge commit '5eb49e0f' into m 

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

Change-Id: Idc9c84c2ca7dec2540ceccead7927fddb912ff12
parents f0cae1a3 5eb49e0f

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

+1 −1
Original line number Diff line number Diff line
@@ -4904,7 +4904,7 @@ public final class BatteryStatsImpl extends BatteryStats { 
    void readOldHistory(Parcel in) {

        mHistory = mHistoryEnd = mHistoryCache = null;

        long time;

        while ((time=in.readLong()) >= 0) {

        while (in.dataAvail() > 0 && (time=in.readLong()) >= 0) {

            HistoryItem rec = new HistoryItem(time, in);

            addHistoryRecordLocked(rec);

        }