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

Merge "BatteryStatsImpl: Add parcel methods for DisplayBatteryStats." am: 4a0a36425a

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

Change-Id: Icf5f95bbe8d6f9fffe2214ac4200bd797bd424a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-06-22 19:53:06 +00:00
committed by Automerger Merge Worker
parent 930a17f766 4a0a36425a
commit 405eaf10dc
1 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -160,7 +160,7 @@ public class BatteryStatsImpl extends BatteryStats {
private static final int MAGIC = 0xBA757475; // 'BATSTATS'
// Current on-disk Parcel version
static final int VERSION = 200;
static final int VERSION = 201;
// The maximum number of names wakelocks we will keep track of
// per uid; once the limit is reached, we batch the remaining wakelocks
@@ -929,6 +929,28 @@ public class BatteryStatsImpl extends BatteryStats {
screenBrightnessTimers[i].reset(false, elapsedRealtimeUs);
}
}
/**
* Write data to summary parcel
*/
public void writeSummaryToParcel(Parcel out, long elapsedRealtimeUs) {
screenOnTimer.writeSummaryFromParcelLocked(out, elapsedRealtimeUs);
screenDozeTimer.writeSummaryFromParcelLocked(out, elapsedRealtimeUs);
for (int i = 0; i < NUM_SCREEN_BRIGHTNESS_BINS; i++) {
screenBrightnessTimers[i].writeSummaryFromParcelLocked(out, elapsedRealtimeUs);
}
}
/**
* Read data from summary parcel
*/
public void readSummaryFromParcel(Parcel in) {
screenOnTimer.readSummaryFromParcelLocked(in);
screenDozeTimer.readSummaryFromParcelLocked(in);
for (int i = 0; i < NUM_SCREEN_BRIGHTNESS_BINS; i++) {
screenBrightnessTimers[i].readSummaryFromParcelLocked(in);
}
}
}
DisplayBatteryStats[] mPerDisplayBatteryStats;
@@ -15636,6 +15658,10 @@ public class BatteryStatsImpl extends BatteryStats {
for (int i=0; i<NUM_SCREEN_BRIGHTNESS_BINS; i++) {
mScreenBrightnessTimer[i].readSummaryFromParcelLocked(in);
}
final int numDisplays = in.readInt();
for (int i = 0; i < numDisplays; i++) {
mPerDisplayBatteryStats[i].readSummaryFromParcel(in);
}
mInteractive = false;
mInteractiveTimer.readSummaryFromParcelLocked(in);
mPhoneOn = false;
@@ -16135,6 +16161,11 @@ public class BatteryStatsImpl extends BatteryStats {
for (int i=0; i<NUM_SCREEN_BRIGHTNESS_BINS; i++) {
mScreenBrightnessTimer[i].writeSummaryFromParcelLocked(out, NOWREAL_SYS);
}
final int numDisplays = mPerDisplayBatteryStats.length;
out.writeInt(numDisplays);
for (int i = 0; i < numDisplays; i++) {
mPerDisplayBatteryStats[i].writeSummaryToParcel(out, NOWREAL_SYS);
}
mInteractiveTimer.writeSummaryFromParcelLocked(out, NOWREAL_SYS);
mPowerSaveModeEnabledTimer.writeSummaryFromParcelLocked(out, NOWREAL_SYS);
out.writeLong(mLongestLightIdleTimeMs);