commit eef94f8f4f17a516cfe962a9e71723db81d60e13
author Benjamin Schwartz <bsschwar@google.com> Wed Feb 03 12:55:39 2021 -0800
committer Benjamin Schwartz <bsschwar@google.com> Thu Feb 04 15:29:00 2021 -0800
tree fef409b835107a188afd5cc4d7d6cb8638a13a8c
parent c357e98dcc35fd6283e038d89d8d9da45c9f0e07

power/stats: Rename readEnergyMeters to readEnergyMeter

Bug: 135067502
Test: build
Change-Id: I76e73668faf248ca33a37eb221973d2164d9c9b8
Merged-In: I76e73668faf248ca33a37eb221973d2164d9c9b8

power/stats/aidl/default/PowerStats.cpp

diff --git a/power/stats/aidl/default/PowerStats.cpp b/power/stats/aidl/default/PowerStats.cpp
index 6cb0a73..0ffbd08 100644
--- a/power/stats/aidl/default/PowerStats.cpp
+++ b/power/stats/aidl/default/PowerStats.cpp
@@ -53,8 +53,8 @@
     return ndk::ScopedAStatus::ok();
 }
 
-ndk::ScopedAStatus PowerStats::readEnergyMeters(const std::vector<int32_t>& in_channelIds,
-                                                std::vector<EnergyMeasurement>* _aidl_return) {
+ndk::ScopedAStatus PowerStats::readEnergyMeter(const std::vector<int32_t>& in_channelIds,
+                                               std::vector<EnergyMeasurement>* _aidl_return) {
     (void)in_channelIds;
     (void)_aidl_return;
     return ndk::ScopedAStatus::ok();

power/stats/aidl/default/PowerStats.h

diff --git a/power/stats/aidl/default/PowerStats.h b/power/stats/aidl/default/PowerStats.h
index 04c2d54..cb98e55 100644
--- a/power/stats/aidl/default/PowerStats.h
+++ b/power/stats/aidl/default/PowerStats.h
@@ -35,8 +35,8 @@
     ndk::ScopedAStatus getEnergyConsumed(const std::vector<int32_t>& in_energyConsumerIds,
                                          std::vector<EnergyConsumerResult>* _aidl_return) override;
     ndk::ScopedAStatus getEnergyMeterInfo(std::vector<Channel>* _aidl_return) override;
-    ndk::ScopedAStatus readEnergyMeters(const std::vector<int32_t>& in_channelIds,
-                                        std::vector<EnergyMeasurement>* _aidl_return) override;
+    ndk::ScopedAStatus readEnergyMeter(const std::vector<int32_t>& in_channelIds,
+                                       std::vector<EnergyMeasurement>* _aidl_return) override;
 };
 
 }  // namespace stats