commit 74e09c73e8223d07de41239da6ba781c9cf54931
author Benjamin Schwartz <bsschwar@google.com> Mon Dec 21 14:57:45 2020 -0800
committer Benjamin Schwartz <bsschwar@google.com> Thu Feb 04 15:28:13 2021 -0800
tree df3ff11410754b70b6811e2b81bd5f7ab113230a
parent 192ee6b315562ecce07d26351e4596444c0a42f7

power/stats: Add EnergyConsumer types

Also cleaning up Power Stats HAL type names to be less verbose

Bug: 176117316
Test: atest VtsHalPowerStatsTargetTest
Change-Id: I252a13b0490326ab9557f4a81ee313e57eb36754
Merged-In: I252a13b0490326ab9557f4a81ee313e57eb36754

power/stats/aidl/default/PowerStats.cpp

diff --git a/power/stats/aidl/default/PowerStats.cpp b/power/stats/aidl/default/PowerStats.cpp
index 367ee95..6cb0a73 100644
--- a/power/stats/aidl/default/PowerStats.cpp
+++ b/power/stats/aidl/default/PowerStats.cpp
@@ -24,7 +24,7 @@
 namespace power {
 namespace stats {
 
-ndk::ScopedAStatus PowerStats::getPowerEntityInfo(std::vector<PowerEntityInfo>* _aidl_return) {
+ndk::ScopedAStatus PowerStats::getPowerEntityInfo(std::vector<PowerEntity>* _aidl_return) {
     (void)_aidl_return;
     return ndk::ScopedAStatus::ok();
 }
@@ -36,20 +36,19 @@
     return ndk::ScopedAStatus::ok();
 }
 
-ndk::ScopedAStatus PowerStats::getEnergyConsumerInfo(std::vector<EnergyConsumerId>* _aidl_return) {
+ndk::ScopedAStatus PowerStats::getEnergyConsumerInfo(std::vector<EnergyConsumer>* _aidl_return) {
     (void)_aidl_return;
     return ndk::ScopedAStatus::ok();
 }
 
-ndk::ScopedAStatus PowerStats::getEnergyConsumed(
-        const std::vector<EnergyConsumerId>& in_energyConsumerIds,
-        std::vector<EnergyConsumerResult>* _aidl_return) {
+ndk::ScopedAStatus PowerStats::getEnergyConsumed(const std::vector<int32_t>& in_energyConsumerIds,
+                                                 std::vector<EnergyConsumerResult>* _aidl_return) {
     (void)in_energyConsumerIds;
     (void)_aidl_return;
     return ndk::ScopedAStatus::ok();
 }
 
-ndk::ScopedAStatus PowerStats::getEnergyMeterInfo(std::vector<ChannelInfo>* _aidl_return) {
+ndk::ScopedAStatus PowerStats::getEnergyMeterInfo(std::vector<Channel>* _aidl_return) {
     (void)_aidl_return;
     return ndk::ScopedAStatus::ok();
 }