Power: rename namespace for Pixel power HAL

Bug: 152811907
Test: Build
Change-Id: I6848e929d8a26b540fcee9145376b896c3cd9799

5 files changed, 19 insertions, 21 deletions

diff --git a/power-libperfmgr/aidl/Power.cpp b/power-libperfmgr/aidl/Power.cpp
index 8b20dde..eba695d 100644
--- a/power-libperfmgr/aidl/Power.cpp
+++ b/power-libperfmgr/aidl/Power.cpp
@@ -33,7 +33,7 @@
 #include "disp-power/display-helper.h"
 
 namespace aidl {
-namespace android {
+namespace google {
 namespace hardware {
 namespace power {
 namespace impl {
@@ -254,5 +254,5 @@ binder_status_t Power::dump(int fd, const char **, uint32_t) {
 }  // namespace impl
 }  // namespace power
 }  // namespace hardware
-}  // namespace android
+}  // namespace google
 }  // namespace aidl
diff --git a/power-libperfmgr/aidl/Power.h b/power-libperfmgr/aidl/Power.h
index 9780583..05b8780 100644
--- a/power-libperfmgr/aidl/Power.h
+++ b/power-libperfmgr/aidl/Power.h
@@ -26,16 +26,18 @@
 #include "disp-power/InteractionHandler.h"
 
 namespace aidl {
-namespace android {
+namespace google {
 namespace hardware {
 namespace power {
 namespace impl {
 namespace pixel {
 
 using ::InteractionHandler;
+using ::aidl::android::hardware::power::Boost;
+using ::aidl::android::hardware::power::Mode;
 using ::android::perfmgr::HintManager;
 
-class Power : public BnPower {
+class Power : public ::aidl::android::hardware::power::BnPower {
   public:
     Power(std::shared_ptr<HintManager> hm);
     ndk::ScopedAStatus setMode(Mode type, bool enabled) override;
@@ -55,5 +57,5 @@ class Power : public BnPower {
 }  // namespace impl
 }  // namespace power
 }  // namespace hardware
-}  // namespace android
+}  // namespace google
 }  // namespace aidl
diff --git a/power-libperfmgr/aidl/PowerExt.cpp b/power-libperfmgr/aidl/PowerExt.cpp
index 00eb095..24e855d 100644
--- a/power-libperfmgr/aidl/PowerExt.cpp
+++ b/power-libperfmgr/aidl/PowerExt.cpp
@@ -31,12 +31,11 @@
 #include <utils/Trace.h>
 
 namespace aidl {
-namespace android {
+namespace google {
 namespace hardware {
-namespace pixel {
-namespace extension {
 namespace power {
 namespace impl {
+namespace pixel {
 
 ndk::ScopedAStatus PowerExt::setMode(const std::string &mode, bool enabled) {
     LOG(DEBUG) << "PowerExt setMode: " << mode << " to: " << enabled;
@@ -80,10 +79,9 @@ ndk::ScopedAStatus PowerExt::isBoostSupported(const std::string &boost, bool *_a
     return ndk::ScopedAStatus::ok();
 }
 
+}  // namespace pixel
 }  // namespace impl
 }  // namespace power
-}  // namespace extension
-}  // namespace pixel
 }  // namespace hardware
-}  // namespace android
+}  // namespace google
 }  // namespace aidl
diff --git a/power-libperfmgr/aidl/PowerExt.h b/power-libperfmgr/aidl/PowerExt.h
index 9983dc6..885c6a0 100644
--- a/power-libperfmgr/aidl/PowerExt.h
+++ b/power-libperfmgr/aidl/PowerExt.h
@@ -20,20 +20,19 @@
 #include <memory>
 #include <thread>
 
-#include <aidl/android/hardware/pixel/extension/power/BnPowerExt.h>
+#include <aidl/google/hardware/power/extension/pixel/BnPowerExt.h>
 #include <perfmgr/HintManager.h>
 
 namespace aidl {
-namespace android {
+namespace google {
 namespace hardware {
-namespace pixel {
-namespace extension {
 namespace power {
 namespace impl {
+namespace pixel {
 
 using ::android::perfmgr::HintManager;
 
-class PowerExt : public BnPowerExt {
+class PowerExt : public ::aidl::google::hardware::power::extension::pixel::BnPowerExt {
   public:
     PowerExt(std::shared_ptr<HintManager> hm) : mHintManager(hm) {}
     ndk::ScopedAStatus setMode(const std::string &mode, bool enabled) override;
@@ -45,10 +44,9 @@ class PowerExt : public BnPowerExt {
     std::shared_ptr<HintManager> mHintManager;
 };
 
+}  // namespace pixel
 }  // namespace impl
 }  // namespace power
-}  // namespace extension
-}  // namespace pixel
 }  // namespace hardware
-}  // namespace android
+}  // namespace google
 }  // namespace aidl
diff --git a/power-libperfmgr/aidl/service.cpp b/power-libperfmgr/aidl/service.cpp
index eb24170..4db1c30 100644
--- a/power-libperfmgr/aidl/service.cpp
+++ b/power-libperfmgr/aidl/service.cpp
@@ -26,8 +26,8 @@
 #include "Power.h"
 #include "PowerExt.h"
 
-using aidl::android::hardware::pixel::extension::power::impl::PowerExt;
-using aidl::android::hardware::power::impl::pixel::Power;
+using aidl::google::hardware::power::impl::pixel::Power;
+using aidl::google::hardware::power::impl::pixel::PowerExt;
 using ::android::perfmgr::HintManager;
 
 constexpr char kPowerHalConfigPath[] = "/vendor/etc/powerhint.json";