powerstats: PowerStats HAL has been renamed

Bug: 169864180
Test: m
Change-Id: I5491e93004ebabfe12a73d397b5b996d1dfffffa

11 files changed, 50 insertions, 30 deletions

diff --git a/powerstats/Android.bp b/powerstats/Android.bp
index 9d60fe3..b62f368 100644
--- a/powerstats/Android.bp
+++ b/powerstats/Android.bp
@@ -27,7 +27,7 @@ cc_library_static {
 }
 
 cc_library {
-    name: "android.hardware.powerstats-impl.pixel",
+    name: "android.hardware.power.stats-impl.pixel",
     vendor_available: true,
     export_include_dirs: ["include"],
 
@@ -51,6 +51,6 @@ cc_library {
         "libhardware",
         "liblog",
         "libutils",
-        "android.hardware.powerstats-ndk_platform",
+        "android.hardware.power.stats-ndk_platform",
     ],
 }
\ No newline at end of file
diff --git a/powerstats/PowerStatsAidl.cpp b/powerstats/PowerStatsAidl.cpp
index 561ed53..ff86709 100644
--- a/powerstats/PowerStatsAidl.cpp
+++ b/powerstats/PowerStatsAidl.cpp
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#define LOG_TAG "android.hardware.powerstats-service.pixel"
+#define LOG_TAG "android.hardware.power.stats-service.pixel"
 
 #include "include/PowerStatsAidl.h"
-#include <aidl/android/hardware/powerstats/BnPowerStats.h>
+#include <aidl/android/hardware/power/stats/BnPowerStats.h>
 
 #include <android-base/chrono_utils.h>
 #include <android-base/file.h>
@@ -33,7 +33,8 @@
 namespace aidl {
 namespace android {
 namespace hardware {
-namespace powerstats {
+namespace power {
+namespace stats {
 
 void PowerStats::addStateResidencyDataProvider(sp<IStateResidencyDataProvider> p) {
     int32_t id = mPowerEntityInfos.size();
@@ -331,7 +332,8 @@ binder_status_t PowerStats::dump(int fd, const char **args, uint32_t numArgs) {
     return STATUS_OK;
 }
 
-}  // namespace powerstats
+}  // namespace stats
+}  // namespace power
 }  // namespace hardware
 }  // namespace android
 }  // namespace aidl
diff --git a/powerstats/dataproviders/DisplayStateResidencyDataProvider.cpp b/powerstats/dataproviders/DisplayStateResidencyDataProvider.cpp
index 12f605f..ffe5273 100644
--- a/powerstats/dataproviders/DisplayStateResidencyDataProvider.cpp
+++ b/powerstats/dataproviders/DisplayStateResidencyDataProvider.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define LOG_TAG "android.hardware.powerstats-service.pixel"
+#define LOG_TAG "android.hardware.power.stats-service.pixel"
 
 #include <dataproviders/DisplayStateResidencyDataProvider.h>
 
@@ -29,7 +29,8 @@
 namespace aidl {
 namespace android {
 namespace hardware {
-namespace powerstats {
+namespace power {
+namespace stats {
 
 DisplayStateResidencyDataProvider::DisplayStateResidencyDataProvider(
         std::string name, std::string path, std::vector<std::string> states)
@@ -148,7 +149,8 @@ bool DisplayStateResidencyDataProvider::threadLoop() {
     return true;
 }
 
-}  // namespace powerstats
+}  // namespace stats
+}  // namespace power
 }  // namespace hardware
 }  // namespace android
 }  // namespace aidl
diff --git a/powerstats/dataproviders/GenericStateResidencyDataProvider.cpp b/powerstats/dataproviders/GenericStateResidencyDataProvider.cpp
index fa9faeb..b550058 100644
--- a/powerstats/dataproviders/GenericStateResidencyDataProvider.cpp
+++ b/powerstats/dataproviders/GenericStateResidencyDataProvider.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define LOG_TAG "android.hardware.powerstats-service.pixel"
+#define LOG_TAG "android.hardware.power.stats-service.pixel"
 
 #include <android-base/logging.h>
 #include <android-base/strings.h>
@@ -24,7 +24,8 @@
 namespace aidl {
 namespace android {
 namespace hardware {
-namespace powerstats {
+namespace power {
+namespace stats {
 
 std::vector<GenericStateResidencyDataProvider::StateResidencyConfig>
 generateGenericStateResidencyConfigs(
@@ -203,7 +204,8 @@ GenericStateResidencyDataProvider::getInfo() {
     return ret;
 }
 
-}  // namespace powerstats
+}  // namespace stats
+}  // namespace power
 }  // namespace hardware
 }  // namespace android
 }  // namespace aidl
diff --git a/powerstats/dataproviders/IioEnergyMeterDataProvider.cpp b/powerstats/dataproviders/IioEnergyMeterDataProvider.cpp
index fa459ee..15397bf 100644
--- a/powerstats/dataproviders/IioEnergyMeterDataProvider.cpp
+++ b/powerstats/dataproviders/IioEnergyMeterDataProvider.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define LOG_TAG "android.hardware.powerstats-service.pixel"
+#define LOG_TAG "android.hardware.power.stats-service.pixel"
 
 #include <dataproviders/IioEnergyMeterDataProvider.h>
 
@@ -26,7 +26,8 @@
 namespace aidl {
 namespace android {
 namespace hardware {
-namespace powerstats {
+namespace power {
+namespace stats {
 
 void IioEnergyMeterDataProvider::findIioEnergyMeterNodes() {
     struct dirent *ent;
@@ -170,7 +171,8 @@ ndk::ScopedAStatus IioEnergyMeterDataProvider::getEnergyMeterInfo(
     return ndk::ScopedAStatus::ok();
 }
 
-}  // namespace powerstats
+}  // namespace stats
+}  // namespace power
 }  // namespace hardware
 }  // namespace android
 }  // namespace aidl
diff --git a/powerstats/dataproviders/WlanStateResidencyDataProvider.cpp b/powerstats/dataproviders/WlanStateResidencyDataProvider.cpp
index 061f05c..3e448d1 100644
--- a/powerstats/dataproviders/WlanStateResidencyDataProvider.cpp
+++ b/powerstats/dataproviders/WlanStateResidencyDataProvider.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define LOG_TAG "android.hardware.powerstats-service.pixel"
+#define LOG_TAG "android.hardware.power.stats-service.pixel"
 
 #include <android-base/logging.h>
 #include <android-base/properties.h>
@@ -25,7 +25,8 @@
 namespace aidl {
 namespace android {
 namespace hardware {
-namespace powerstats {
+namespace power {
+namespace stats {
 
 enum {
     ACTIVE_ID = 0,
@@ -107,7 +108,8 @@ std::unordered_map<std::string, std::vector<StateInfo>> WlanStateResidencyDataPr
     return ret;
 }
 
-}  // namespace powerstats
+}  // namespace stats
+}  // namespace power
 }  // namespace hardware
 }  // namespace android
 }  // namespace aidl
diff --git a/powerstats/include/PowerStatsAidl.h b/powerstats/include/PowerStatsAidl.h
index 669994c..5a9d906 100644
--- a/powerstats/include/PowerStatsAidl.h
+++ b/powerstats/include/PowerStatsAidl.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <aidl/android/hardware/powerstats/BnPowerStats.h>
+#include <aidl/android/hardware/power/stats/BnPowerStats.h>
 
 #include <utils/RefBase.h>
 
@@ -25,7 +25,8 @@
 namespace aidl {
 namespace android {
 namespace hardware {
-namespace powerstats {
+namespace power {
+namespace stats {
 
 using ::android::sp;
 
@@ -52,7 +53,7 @@ class PowerStats : public BnPowerStats {
     void setEnergyMeterDataProvider(std::unique_ptr<IEnergyMeterDataProvider> p);
     void addStateResidencyDataProvider(sp<IStateResidencyDataProvider> p);
 
-    // Methods from aidl::android::hardware::powerstats::IPowerStats
+    // Methods from aidl::android::hardware::power::stats::IPowerStats
     ndk::ScopedAStatus getPowerEntityInfo(std::vector<PowerEntityInfo> *_aidl_return) override;
     ndk::ScopedAStatus getStateResidency(const std::vector<int32_t> &in_powerEntityIds,
                                          std::vector<StateResidencyResult> *_aidl_return) override;
@@ -82,7 +83,8 @@ class PowerStats : public BnPowerStats {
     std::unique_ptr<IEnergyMeterDataProvider> mEnergyMeterDataProvider;
 };
 
-}  // namespace powerstats
+}  // namespace stats
+}  // namespace power
 }  // namespace hardware
 }  // namespace android
 }  // namespace aidl
diff --git a/powerstats/include/dataproviders/DisplayStateResidencyDataProvider.h b/powerstats/include/dataproviders/DisplayStateResidencyDataProvider.h
index 29b6754..8b67e1a 100644
--- a/powerstats/include/dataproviders/DisplayStateResidencyDataProvider.h
+++ b/powerstats/include/dataproviders/DisplayStateResidencyDataProvider.h
@@ -30,7 +30,8 @@
 namespace aidl {
 namespace android {
 namespace hardware {
-namespace powerstats {
+namespace power {
+namespace stats {
 
 class DisplayStateResidencyDataProvider : public PowerStats::IStateResidencyDataProvider,
                                           public ::android::Thread {
@@ -71,7 +72,8 @@ class DisplayStateResidencyDataProvider : public PowerStats::IStateResidencyData
     sp<::android::Looper> mLooper;
 };
 
-}  // namespace powerstats
+}  // namespace stats
+}  // namespace power
 }  // namespace hardware
 }  // namespace android
 }  // namespace aidl
diff --git a/powerstats/include/dataproviders/GenericStateResidencyDataProvider.h b/powerstats/include/dataproviders/GenericStateResidencyDataProvider.h
index d6601e0..c0895f2 100644
--- a/powerstats/include/dataproviders/GenericStateResidencyDataProvider.h
+++ b/powerstats/include/dataproviders/GenericStateResidencyDataProvider.h
@@ -21,7 +21,8 @@
 namespace aidl {
 namespace android {
 namespace hardware {
-namespace powerstats {
+namespace power {
+namespace stats {
 
 class GenericStateResidencyDataProvider : public PowerStats::IStateResidencyDataProvider {
   public:
@@ -75,7 +76,8 @@ generateGenericStateResidencyConfigs(
         const GenericStateResidencyDataProvider::StateResidencyConfig &stateConfig,
         const std::vector<std::pair<std::string, std::string>> &stateHeaders);
 
-}  // namespace powerstats
+}  // namespace stats
+}  // namespace power
 }  // namespace hardware
 }  // namespace android
 }  // namespace aidl
diff --git a/powerstats/include/dataproviders/IioEnergyMeterDataProvider.h b/powerstats/include/dataproviders/IioEnergyMeterDataProvider.h
index b2aaefd..12f3bbf 100644
--- a/powerstats/include/dataproviders/IioEnergyMeterDataProvider.h
+++ b/powerstats/include/dataproviders/IioEnergyMeterDataProvider.h
@@ -23,7 +23,8 @@
 namespace aidl {
 namespace android {
 namespace hardware {
-namespace powerstats {
+namespace power {
+namespace stats {
 
 class IioEnergyMeterDataProvider : public PowerStats::IEnergyMeterDataProvider {
   public:
@@ -54,7 +55,8 @@ class IioEnergyMeterDataProvider : public PowerStats::IEnergyMeterDataProvider {
     const std::string kEnergyValueNode = "/energy_value";
 };
 
-}  // namespace powerstats
+}  // namespace stats
+}  // namespace power
 }  // namespace hardware
 }  // namespace android
 }  // namespace aidl
diff --git a/powerstats/include/dataproviders/WlanStateResidencyDataProvider.h b/powerstats/include/dataproviders/WlanStateResidencyDataProvider.h
index 8dad8a3..c1e2175 100644
--- a/powerstats/include/dataproviders/WlanStateResidencyDataProvider.h
+++ b/powerstats/include/dataproviders/WlanStateResidencyDataProvider.h
@@ -21,7 +21,8 @@
 namespace aidl {
 namespace android {
 namespace hardware {
-namespace powerstats {
+namespace power {
+namespace stats {
 
 class WlanStateResidencyDataProvider : public PowerStats::IStateResidencyDataProvider {
   public:
@@ -39,7 +40,8 @@ class WlanStateResidencyDataProvider : public PowerStats::IStateResidencyDataPro
     const std::string mPath;
 };
 
-}  // namespace powerstats
+}  // namespace stats
+}  // namespace power
 }  // namespace hardware
 }  // namespace android
 }  // namespace aidl