diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-17 22:04:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-02-17 22:04:34 +0000 |
| commit | a5ec53d68f74de295b27b23b7887b3f794d488cc (patch) | |
| tree | 073acc0ada15b7cc5c7d425efbf081d00e42b88b | |
| parent | dfd890a1010fc48315587e4ab04b63f319c934a2 (diff) | |
| parent | eb214d03281be7b0c67ef6a679bc5d56d7690310 (diff) | |
Merge "power/stats: Add more energy consumer types"
2 files changed, 11 insertions, 3 deletions
diff --git a/power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/EnergyConsumerType.aidl b/power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/EnergyConsumerType.aidl index 7b05d2f426..ce3e1f59bf 100644 --- a/power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/EnergyConsumerType.aidl +++ b/power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/EnergyConsumerType.aidl @@ -34,6 +34,10 @@ package android.hardware.power.stats; @VintfStability enum EnergyConsumerType { OTHER = 0, - CPU_CLUSTER = 1, - DISPLAY = 2, + BLUETOOTH = 1, + CPU_CLUSTER = 2, + DISPLAY = 3, + GNSS = 4, + MOBILE_RADIO = 5, + WIFI = 6, } diff --git a/power/stats/aidl/android/hardware/power/stats/EnergyConsumerType.aidl b/power/stats/aidl/android/hardware/power/stats/EnergyConsumerType.aidl index 7fd2348d70..d871ced214 100644 --- a/power/stats/aidl/android/hardware/power/stats/EnergyConsumerType.aidl +++ b/power/stats/aidl/android/hardware/power/stats/EnergyConsumerType.aidl @@ -20,6 +20,10 @@ package android.hardware.power.stats; @VintfStability enum EnergyConsumerType { OTHER, + BLUETOOTH, CPU_CLUSTER, DISPLAY, -}
\ No newline at end of file + GNSS, + MOBILE_RADIO, + WIFI, +} |