power-libperfmgr: rename namespace for Pixel power HAL
Bug: 152811907
Test: Build
Change-Id: I6848e929d8a26b540fcee9145376b896c3cd9799
diff --git a/aidl/power-libperfmgr/Power.cpp b/aidl/power-libperfmgr/Power.cpp
index 90d4189..833d657 100644
--- a/aidl/power-libperfmgr/Power.cpp
+++ b/aidl/power-libperfmgr/Power.cpp
@@ -31,7 +31,7 @@
#include <utils/Trace.h>
namespace aidl {
-namespace android {
+namespace google {
namespace hardware {
namespace power {
namespace impl {
@@ -237,5 +237,5 @@
} // namespace impl
} // namespace power
} // namespace hardware
-} // namespace android
+} // namespace google
} // namespace aidl
diff --git a/aidl/power-libperfmgr/Power.h b/aidl/power-libperfmgr/Power.h
index d9ef553..04e16d6 100644
--- a/aidl/power-libperfmgr/Power.h
+++ b/aidl/power-libperfmgr/Power.h
@@ -26,16 +26,18 @@
#include "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 @@
} // namespace impl
} // namespace power
} // namespace hardware
-} // namespace android
+} // namespace google
} // namespace aidl
diff --git a/aidl/power-libperfmgr/PowerExt.cpp b/aidl/power-libperfmgr/PowerExt.cpp
index 2618ef2..6c268b6 100644
--- a/aidl/power-libperfmgr/PowerExt.cpp
+++ b/aidl/power-libperfmgr/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 @@
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/aidl/power-libperfmgr/PowerExt.h b/aidl/power-libperfmgr/PowerExt.h
index 9983dc6..885c6a0 100644
--- a/aidl/power-libperfmgr/PowerExt.h
+++ b/aidl/power-libperfmgr/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 @@
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/aidl/power-libperfmgr/service.cpp b/aidl/power-libperfmgr/service.cpp
index 40e7add..1389326 100644
--- a/aidl/power-libperfmgr/service.cpp
+++ b/aidl/power-libperfmgr/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";