diff options
| author | Benjamin Schwartz <bsschwar@google.com> | 2021-05-12 00:28:31 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-12 00:28:31 +0000 |
| commit | 6ad8f4ea6acc2d74c8d39d6c4b88959524dbbf0b (patch) | |
| tree | ec230037b70e81130653f61dc21edeebed0eb374 | |
| parent | 75d290bd75998c3ae32473e267e8924ae9fff53b (diff) | |
| parent | 1aaf18b6f2126e138cbb917529abf66384ee680d (diff) | |
Merge "power/stats: Correct language surrounding timestamps" am: 75d7e5de7c am: f2d5702776 am: 1aaf18b6f2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1703725
Change-Id: Id55555fa6d71fdd8fc177d156c479090252e47b0
| -rw-r--r-- | power/stats/aidl/android/hardware/power/stats/EnergyConsumerResult.aidl | 3 | ||||
| -rw-r--r-- | power/stats/aidl/android/hardware/power/stats/EnergyMeasurement.aidl | 3 |
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; } - |