Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BatteryStatsImpl: Add mBatteryTimeToFull to parcel

Browse Source 
Bug: 163342637
Test: Ensure that both Settings/SystemUI ttf are synchronized
Change-Id: I844149d4787e3aef7808bb4f85b0f08d179c5c41
This commit is contained in:
Stephane Lee
2020-09-21 18:06:56 -07:00
parent d94793dc9a
commit 4b967a454e
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/com/android/internal/os/BatteryStatsImpl.java
View File

@@ -156,7 +156,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 = 187 + (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
@@ -14569,6 +14569,7 @@ public class BatteryStatsImpl extends BatteryStats {
mDailyStartTimeMs = in.readLong(); mDailyStartTimeMs = in.readLong();
mNextMinDailyDeadlineMs = in.readLong(); mNextMinDailyDeadlineMs = in.readLong();
mNextMaxDailyDeadlineMs = in.readLong(); mNextMaxDailyDeadlineMs = in.readLong();
mBatteryTimeToFullSeconds = in.readLong();
mStartCount++; mStartCount++;
@@ -15061,6 +15062,7 @@ public class BatteryStatsImpl extends BatteryStats {
out.writeLong(mDailyStartTimeMs); out.writeLong(mDailyStartTimeMs);
out.writeLong(mNextMinDailyDeadlineMs); out.writeLong(mNextMinDailyDeadlineMs);
out.writeLong(mNextMaxDailyDeadlineMs); out.writeLong(mNextMaxDailyDeadlineMs);
out.writeLong(mBatteryTimeToFullSeconds);
mScreenOnTimer.writeSummaryFromParcelLocked(out, NOWREAL_SYS); mScreenOnTimer.writeSummaryFromParcelLocked(out, NOWREAL_SYS);
mScreenDozeTimer.writeSummaryFromParcelLocked(out, NOWREAL_SYS); mScreenDozeTimer.writeSummaryFromParcelLocked(out, NOWREAL_SYS);
@@ -15644,6 +15646,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);
mLastWriteTimeMs = in.readLong(); mLastWriteTimeMs = in.readLong();
mBatteryTimeToFullSeconds = in.readLong();
mRpmStats.clear(); mRpmStats.clear();
int NRPMS = in.readInt(); int NRPMS = in.readInt();
@@ -15843,6 +15846,7 @@ public class BatteryStatsImpl extends BatteryStats {
mDischargeLightDozeCounter.writeToParcel(out); mDischargeLightDozeCounter.writeToParcel(out);
mDischargeDeepDozeCounter.writeToParcel(out); mDischargeDeepDozeCounter.writeToParcel(out);
out.writeLong(mLastWriteTimeMs); out.writeLong(mLastWriteTimeMs);
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()) {