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

Commit b88e1801 authored by Thierry Strudel's avatar Thierry Strudel Committed by Automerger Merge Worker
Browse files

Merge "BatteryStatsImpl: Add mBatteryTimeToFull to parcel" am: dee14d2d 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1430103

Change-Id: Ib0caa12b9ead16b1fa541f2baf28f82acef08355
parents 5565ad41 dee14d2d

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

+5 −1
Original line number Original line Diff line number Diff line
@@ -151,7 +151,7 @@ public class BatteryStatsImpl extends BatteryStats { 
    private static final int MAGIC = 0xBA757475; // 'BATSTATS'

    private static final int MAGIC = 0xBA757475; // 'BATSTATS'

















    // Current on-disk Parcel version







    // Current on-disk Parcel version











    static final int VERSION = 186 + (USE_OLD_HISTORY ? 1000 : 0);







    static final int VERSION = 188 + (USE_OLD_HISTORY ? 1000 : 0);



























    // The maximum number of names wakelocks we will keep track of







    // The maximum number of names wakelocks we will keep track of











    // per uid; once the limit is reached, we batch the remaining wakelocks







    // per uid; once the limit is reached, we batch the remaining wakelocks










@@ -13596,6 +13596,7 @@ public class BatteryStatsImpl extends BatteryStats {









        mDailyStartTime = in.readLong();







        mDailyStartTime = in.readLong();











        mNextMinDailyDeadline = in.readLong();







        mNextMinDailyDeadline = in.readLong();











        mNextMaxDailyDeadline = in.readLong();







        mNextMaxDailyDeadline = in.readLong();














        mBatteryTimeToFullSeconds = in.readLong();



























        mStartCount++;







        mStartCount++;


























@@ -14086,6 +14087,7 @@ public class BatteryStatsImpl extends BatteryStats {









        out.writeLong(mDailyStartTime);







        out.writeLong(mDailyStartTime);











        out.writeLong(mNextMinDailyDeadline);







        out.writeLong(mNextMinDailyDeadline);











        out.writeLong(mNextMaxDailyDeadline);







        out.writeLong(mNextMaxDailyDeadline);














        out.writeLong(mBatteryTimeToFullSeconds);



























        mScreenOnTimer.writeSummaryFromParcelLocked(out, NOWREAL_SYS);







        mScreenOnTimer.writeSummaryFromParcelLocked(out, NOWREAL_SYS);











        mScreenDozeTimer.writeSummaryFromParcelLocked(out, NOWREAL_SYS);







        mScreenDozeTimer.writeSummaryFromParcelLocked(out, NOWREAL_SYS);










@@ -14669,6 +14671,7 @@ public class BatteryStatsImpl extends BatteryStats {









        mDischargeLightDozeCounter = new LongSamplingCounter(mOnBatteryTimeBase, in);







        mDischargeLightDozeCounter = new LongSamplingCounter(mOnBatteryTimeBase, in);











        mDischargeDeepDozeCounter = new LongSamplingCounter(mOnBatteryTimeBase, in);







        mDischargeDeepDozeCounter = new LongSamplingCounter(mOnBatteryTimeBase, in);











        mLastWriteTime = in.readLong();







        mLastWriteTime = in.readLong();














        mBatteryTimeToFullSeconds = in.readLong();



























        mRpmStats.clear();







        mRpmStats.clear();











        int NRPMS = in.readInt();







        int NRPMS = in.readInt();










@@ -14861,6 +14864,7 @@ public class BatteryStatsImpl extends BatteryStats {









        mDischargeLightDozeCounter.writeToParcel(out);







        mDischargeLightDozeCounter.writeToParcel(out);











        mDischargeDeepDozeCounter.writeToParcel(out);







        mDischargeDeepDozeCounter.writeToParcel(out);











        out.writeLong(mLastWriteTime);







        out.writeLong(mLastWriteTime);














        out.writeLong(mBatteryTimeToFullSeconds);



























        out.writeInt(mRpmStats.size());







        out.writeInt(mRpmStats.size());











        for (Map.Entry<String, SamplingTimer> ent : mRpmStats.entrySet()) {







        for (Map.Entry<String, SamplingTimer> ent : mRpmStats.entrySet()) {