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

Merge "BatteryStatsImpl: Add mBatteryTimeToFull to parcel" am: dee14d2d86 am: b88e1801bd am: 3605379546

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

Change-Id: I65c570ba130fe451e7cdfaceac7545c42609278c
This commit is contained in:
Thierry Strudel
2020-09-25 06:04:16 +00:00
committed by Automerger Merge Worker
parent 6036146b10 3605379546
commit 05eef64cc1
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

@@ -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()) {