commit a47bf3b8adb52894665d57ce8421f63f9aced2c0
author Treehugger Robot <treehugger-gerrit@google.com> Tue Feb 09 19:20:10 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 09 19:20:10 2021 +0000
tree 3068663ab7ddfa900aea7d2664e656bf67bb1a3b
parent b755e019fd072d8b401312b8e299446d2ddd4dfe
parent 020ab6509519ce24d3a9159fc9f12ec5ecda3473

Merge changes from topic "ps 2.0 cp"

* changes:
  Add power.stats to compatibility matrix
  power/stats: Rename readEnergyMeters to readEnergyMeter
  power/stats: Add VTS tests for power stats hal
  Specify version for aidl_interface explicitly
  power/stats: Adding subsystem field to Channel
  power/stats: Add EnergyConsumer types
  power/stats: Add EnergyConsumerAttribution interface
  power/stats: Add duration field to EnergyMeasurement
  power/stats: Rename PowerStats HAL
  power/stats: Move PowerStats HAL 2.0 to power/stats