| commit | f2d570277643ca5048ef1fcba5ad8ad15202e4f7 | [log] [tgz] |
|---|---|---|
| author | Benjamin Schwartz <bsschwar@google.com> | Tue May 11 23:56:25 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 11 23:56:25 2021 +0000 |
| tree | 219ce3501c8cd75cddf102021f30b086ba8338e6 | |
| parent | 1d5c701a44fe77c4bb5b44917b27d4bb637da514 [diff] | |
| parent | 75d7e5de7cf2a47f5bc76b15512b3e3fd332baf4 [diff] |
Merge "power/stats: Correct language surrounding timestamps" am: 75d7e5de7c Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1703725 Change-Id: I36c4fd2ebbd4469cacd18c60b92c4c7d832bd17c
diff --git a/power/stats/aidl/android/hardware/power/stats/EnergyConsumerResult.aidl b/power/stats/aidl/android/hardware/power/stats/EnergyConsumerResult.aidl index 12d2042..66c8c8c 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 @@ */ int id; /** - * Time since boot in milliseconds + * Time of data capture in milliseconds since boot (CLOCK_BOOTTIME clock) */ long timestampMs; /** @@ -38,4 +38,3 @@ */ 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 d3e8f46..31fbaa8 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 @@ */ 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 @@ */ long energyUWs; } -