Some fixes to power manager lib code
- Run clang-format on all recently added files;
- Move all new classes to android::power namespace and remove Power
prefix from all classes and enums;
- Add virtual function specifier to overrides of virtual members;
- Add missing virtual destructors;
- Remove namespaces and aliases from public api of header files;
- Delete constructor and destructor of PowerHalLoader;
- Add helper functions to convert hal results in wrapper
implementations;
- Merge test targets to single libpowermanager_test target;
Bug: 150878220
Test: atest libpowermanager_test
Change-Id: Ie2b5ad69f3b05d5f6b576671bc98e0f83b274152
diff --git a/include/powermanager/PowerHalController.h b/include/powermanager/PowerHalController.h
index 44b8915..dd34c0a 100644
--- a/include/powermanager/PowerHalController.h
+++ b/include/powermanager/PowerHalController.h
@@ -21,58 +21,59 @@
#include <android/hardware/power/Boost.h>
#include <android/hardware/power/IPower.h>
#include <android/hardware/power/Mode.h>
-
#include <powermanager/PowerHalWrapper.h>
-using android::hardware::power::Boost;
-using android::hardware::power::Mode;
-using android::hardware::power::V1_0::Feature;
-using android::hardware::power::V1_0::PowerHint;
-
namespace android {
+namespace power {
+
// -------------------------------------------------------------------------------------------------
// Connects to underlying Power HAL handles.
-class PowerHalConnector {
+class HalConnector {
public:
- PowerHalConnector() = default;
- virtual ~PowerHalConnector() = default;
+ HalConnector() = default;
+ virtual ~HalConnector() = default;
- virtual std::unique_ptr<PowerHalWrapper> connect();
+ virtual std::unique_ptr<HalWrapper> connect();
virtual void reset();
};
// -------------------------------------------------------------------------------------------------
// Controller for Power HAL handle.
-// This relies on PowerHalConnector to connect to the underlying Power HAL service and reconnects to
-// it after each failed api call. This also ensures connecting to the service is thread-safe.
-class PowerHalController : public PowerHalWrapper {
+// This relies on HalConnector to connect to the underlying Power HAL
+// service and reconnects to it after each failed api call. This also ensures
+// connecting to the service is thread-safe.
+class PowerHalController : public HalWrapper {
public:
- PowerHalController() : PowerHalController(std::make_unique<PowerHalConnector>()) {}
- explicit PowerHalController(std::unique_ptr<PowerHalConnector> connector)
- : mHalConnector(std::move(connector)) {}
+ PowerHalController() : PowerHalController(std::make_unique<HalConnector>()) {}
+ explicit PowerHalController(std::unique_ptr<HalConnector> connector)
+ : mHalConnector(std::move(connector)) {}
+ virtual ~PowerHalController() = default;
void init();
- PowerHalResult setBoost(Boost boost, int32_t durationMs) override;
- PowerHalResult setMode(Mode mode, bool enabled) override;
+ virtual HalResult setBoost(hardware::power::Boost boost, int32_t durationMs) override;
+ virtual HalResult setMode(hardware::power::Mode mode, bool enabled) override;
private:
std::mutex mConnectedHalMutex;
- std::unique_ptr<PowerHalConnector> mHalConnector;
+ std::unique_ptr<HalConnector> mHalConnector;
- // Shared pointers to keep global pointer and allow local copies to be used in different threads
- std::shared_ptr<PowerHalWrapper> mConnectedHal GUARDED_BY(mConnectedHalMutex) = nullptr;
- const std::shared_ptr<PowerHalWrapper> mDefaultHal = std::make_shared<EmptyPowerHalWrapper>();
+ // Shared pointers to keep global pointer and allow local copies to be used in
+ // different threads
+ std::shared_ptr<HalWrapper> mConnectedHal GUARDED_BY(mConnectedHalMutex) = nullptr;
+ const std::shared_ptr<HalWrapper> mDefaultHal = std::make_shared<EmptyHalWrapper>();
- std::shared_ptr<PowerHalWrapper> initHal();
- PowerHalResult processHalResult(PowerHalResult result, const char* functionName);
+ std::shared_ptr<HalWrapper> initHal();
+ HalResult processHalResult(HalResult result, const char* functionName);
};
// -------------------------------------------------------------------------------------------------
+}; // namespace power
+
}; // namespace android
#endif // ANDROID_POWERHALCONTROLLER_H