summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Schwartz <bsschwar@google.com>2021-05-11 23:42:59 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2021-05-11 23:42:59 +0000
commit75d7e5de7cf2a47f5bc76b15512b3e3fd332baf4 (patch)
tree219ce3501c8cd75cddf102021f30b086ba8338e6
parent43ae2ecfe4e97113d5d2a86191e89af24ea5210f (diff)
parent1a16edd42b838bc339a17136ef0b7bae85f41d19 (diff)
Merge "power/stats: Correct language surrounding timestamps"
-rw-r--r--power/stats/aidl/android/hardware/power/stats/EnergyConsumerResult.aidl3
-rw-r--r--power/stats/aidl/android/hardware/power/stats/EnergyMeasurement.aidl3
2 files changed, 2 insertions, 4 deletions
diff --git a/power/stats/aidl/android/hardware/power/stats/EnergyConsumerResult.aidl b/power/stats/aidl/android/hardware/power/stats/EnergyConsumerResult.aidl
index 12d2042eb2..66c8c8c58f 100644
--- a/power/stats/aidl/android/hardware/power/stats/EnergyConsumerResult.aidl
+++ b/power/stats/aidl/android/hardware/power/stats/EnergyConsumerResult.aidl
@@ -25,7 +25,7 @@ parcelable EnergyConsumerResult {
*/
int id;
/**
- * Time since boot in milliseconds
+ * Time of data capture in milliseconds since boot (CLOCK_BOOTTIME clock)
*/
long timestampMs;
/**
@@ -38,4 +38,3 @@ parcelable EnergyConsumerResult {
*/
EnergyConsumerAttribution[] attribution;
}
-
diff --git a/power/stats/aidl/android/hardware/power/stats/EnergyMeasurement.aidl b/power/stats/aidl/android/hardware/power/stats/EnergyMeasurement.aidl
index d3e8f46699..31fbaa870d 100644
--- a/power/stats/aidl/android/hardware/power/stats/EnergyMeasurement.aidl
+++ b/power/stats/aidl/android/hardware/power/stats/EnergyMeasurement.aidl
@@ -23,7 +23,7 @@ parcelable EnergyMeasurement {
*/
int id;
/**
- * Approximate time of data capture in millseconds since boot
+ * Time of data capture in milliseconds since boot (CLOCK_BOOTTIME clock)
*/
long timestampMs;
/**
@@ -35,4 +35,3 @@ parcelable EnergyMeasurement {
*/
long energyUWs;
}
-