| commit | 60f4e1cd2671a573bf91660d6ea484d57d4e2aa7 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Nov 12 17:33:18 2020 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Nov 12 17:33:18 2020 +0000 |
| tree | caffb385f71c9acd94dc11f32068f7449fad95e9 | |
| parent | 522df42566481349945c25f27f2960a0a456844a [diff] | |
| parent | 60e4a0b00447888ea95aacd309b50469d2dbb3df [diff] |
Merge "power/stats: Add duration field to EnergyMeasurement"
diff --git a/power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/EnergyMeasurement.aidl b/power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/EnergyMeasurement.aidl index 341909e..4d56ccf 100644 --- a/power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/EnergyMeasurement.aidl +++ b/power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/EnergyMeasurement.aidl
@@ -20,5 +20,6 @@ parcelable EnergyMeasurement { int channelId; long timestampMs; + long durationMs; long energyUWs; }
diff --git a/power/stats/aidl/android/hardware/power/stats/EnergyMeasurement.aidl b/power/stats/aidl/android/hardware/power/stats/EnergyMeasurement.aidl index f873849..d81914d 100644 --- a/power/stats/aidl/android/hardware/power/stats/EnergyMeasurement.aidl +++ b/power/stats/aidl/android/hardware/power/stats/EnergyMeasurement.aidl
@@ -23,11 +23,15 @@ */ int channelId; /** - * Time since boot in milliseconds + * Approximate time of data capture in millseconds since boot */ long timestampMs; /** - * Accumulated energy since boot in microwatt-seconds (uWs) + * Duration in milliseconds that energy has been accumulated + */ + long durationMs; + /** + * Accumulated energy in microwatt-seconds (uWs) */ long energyUWs; }
diff --git a/power/stats/aidl/android/hardware/power/stats/IPowerStats.aidl b/power/stats/aidl/android/hardware/power/stats/IPowerStats.aidl index 85a2ce0..05e2004 100644 --- a/power/stats/aidl/android/hardware/power/stats/IPowerStats.aidl +++ b/power/stats/aidl/android/hardware/power/stats/IPowerStats.aidl
@@ -96,7 +96,7 @@ ChannelInfo[] getEnergyMeterInfo(); /** - * Reports accumulated energy since boot for each specified channel. + * Reports accumulated energy for each specified channel. * * @param channelIds IDs of channels for which data is requested. * Passing an empty list will return energy measurements for all available channels.