powerstats: PowerStats HAL has been renamed

Bug: 169864180
Test: m
Change-Id: I5491e93004ebabfe12a73d397b5b996d1dfffffa

4 files changed, 20 insertions, 12 deletions

diff --git a/powerstats/dataproviders/DisplayStateResidencyDataProvider.cpp b/powerstats/dataproviders/DisplayStateResidencyDataProvider.cpp
index 12f605f9..ffe52732 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 fa9faeba..b550058b 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 fa459eef..15397bfe 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 061f05cc..3e448d1c 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