Add manager controller to Android.bp
The vibrator manager controller introduced in a previous change was not
added to the build and test targets. Adding them now, with some fixed to
the header and cpp files.
Bug: 167946816
Test: atest libvibratorservice_test
Change-Id: I6601c50269b298aadc67fa96eea30733ac4a67c7
diff --git a/services/vibratorservice/VibratorManagerHalController.cpp b/services/vibratorservice/VibratorManagerHalController.cpp
index b24e5c4..6bf6581 100644
--- a/services/vibratorservice/VibratorManagerHalController.cpp
+++ b/services/vibratorservice/VibratorManagerHalController.cpp
@@ -26,13 +26,13 @@
namespace vibrator {
-std::shared_ptr<ManagerHalWrapper> connectHal(std::shared_ptr<CallbackScheduler> scheduler) {
+std::shared_ptr<ManagerHalWrapper> connectManagerHal(std::shared_ptr<CallbackScheduler> scheduler) {
static bool gHalExists = true;
if (gHalExists) {
sp<Aidl::IVibratorManager> hal = waitForVintfService<Aidl::IVibratorManager>();
if (hal) {
ALOGV("Successfully connected to VibratorManager HAL AIDL service.");
- return std::make_shared<AidlManagerHalWrapper>(std::move(scheduler), aidlHal);
+ return std::make_shared<AidlManagerHalWrapper>(std::move(scheduler), hal);
}
}
@@ -80,12 +80,11 @@
// -------------------------------------------------------------------------------------------------
-bool ManagerHalController::init() {
+void ManagerHalController::init() {
std::lock_guard<std::mutex> lock(mConnectedHalMutex);
if (mConnectedHal == nullptr) {
mConnectedHal = mConnector(mCallbackScheduler);
}
- return mConnectedHal != nullptr;
}
HalResult<void> ManagerHalController::ping() {