CSD: add logic for selecting ISoundDose interface
There are two options for supporting sound dose. 1) the hardware
implements the standalone AIDL sound dose interface together with the
legacy audio HIDL HAL or 2) the hardware implements the new sound dose
methods as part of the audio AIDL HAL. The new logic selects the
implementation to use depending on the audio HAL that is active.
Test: bluejay-userdebug logs
Bug: 264254879
Change-Id: I0af9cd31c2e97bb9c9895439f55bbfa50e87e159
diff --git a/media/libaudiohal/impl/DeviceHalHidl.cpp b/media/libaudiohal/impl/DeviceHalHidl.cpp
index 12acebd..e0b1afb 100644
--- a/media/libaudiohal/impl/DeviceHalHidl.cpp
+++ b/media/libaudiohal/impl/DeviceHalHidl.cpp
@@ -17,7 +17,7 @@
#include <stdio.h>
#define LOG_TAG "DeviceHalHidl"
-//#define LOG_NDEBUG 0
+// #define LOG_NDEBUG 0
#include <cutils/native_handle.h>
#include <cutils/properties.h>
@@ -35,6 +35,17 @@
#include "ParameterUtils.h"
#include "StreamHalHidl.h"
+#if MAJOR_VERSION == 7 && MINOR_VERSION == 1
+#include <aidl/android/hardware/audio/core/sounddose/BpSoundDose.h>
+#include <aidl/android/hardware/audio/sounddose/BpSoundDoseFactory.h>
+#include <android/binder_manager.h>
+
+constexpr std::string_view kSoundDoseInterfaceModule = "/default";
+
+using aidl::android::hardware::audio::core::sounddose::ISoundDose;
+using aidl::android::hardware::audio::sounddose::ISoundDoseFactory;
+#endif
+
using ::android::hardware::audio::common::COMMON_TYPES_CPP_VERSION::implementation::HidlUtils;
using ::android::hardware::audio::common::utils::EnumBitfield;
using ::android::hardware::audio::CORE_TYPES_CPP_VERSION::implementation::CoreUtils;
@@ -46,8 +57,21 @@
using namespace ::android::hardware::audio::common::COMMON_TYPES_CPP_VERSION;
using namespace ::android::hardware::audio::CORE_TYPES_CPP_VERSION;
+class DeviceHalHidl::SoundDoseWrapper {
+public:
+ SoundDoseWrapper() = default;
+ ~SoundDoseWrapper() = default;
+
+#if MAJOR_VERSION == 7 && MINOR_VERSION == 1
+ std::shared_ptr<ISoundDoseFactory> mSoundDoseFactory;
+ std::shared_ptr<ISoundDose> mSoundDose;
+#endif
+};
+
DeviceHalHidl::DeviceHalHidl(const sp<::android::hardware::audio::CPP_VERSION::IDevice>& device)
- : CoreConversionHelperHidl("DeviceHalHidl"), mDevice(device) {
+ : CoreConversionHelperHidl("DeviceHalHidl"),
+ mDevice(device),
+ mSoundDoseWrapper(std::make_unique<DeviceHalHidl::SoundDoseWrapper>()) {
}
DeviceHalHidl::DeviceHalHidl(
@@ -56,7 +80,8 @@
#if MAJOR_VERSION <= 6 || (MAJOR_VERSION == 7 && MINOR_VERSION == 0)
mDevice(device),
#endif
- mPrimaryDevice(device) {
+ mPrimaryDevice(device),
+ mSoundDoseWrapper(std::make_unique<DeviceHalHidl::SoundDoseWrapper>()) {
#if MAJOR_VERSION == 7 && MINOR_VERSION == 1
auto getDeviceRet = mPrimaryDevice->getDevice();
if (getDeviceRet.isOk()) {
@@ -574,4 +599,50 @@
return processReturn("dump", ret);
}
+#if MAJOR_VERSION == 7 && MINOR_VERSION == 1
+status_t DeviceHalHidl::getSoundDoseInterface(const std::string& module,
+ ::ndk::SpAIBinder* soundDoseBinder) {
+ if (mSoundDoseWrapper->mSoundDose != nullptr) {
+ *soundDoseBinder = mSoundDoseWrapper->mSoundDose->asBinder();
+ return OK;
+ }
+
+ if (mSoundDoseWrapper->mSoundDoseFactory == nullptr) {
+ std::string interface =
+ std::string(ISoundDoseFactory::descriptor) + kSoundDoseInterfaceModule.data();
+ AIBinder* binder = AServiceManager_checkService(interface.c_str());
+ if (binder == nullptr) {
+ ALOGW("%s service %s doesn't exist", __func__, interface.c_str());
+ return NO_INIT;
+ }
+ mSoundDoseWrapper->mSoundDoseFactory =
+ ISoundDoseFactory::fromBinder(ndk::SpAIBinder(binder));
+ }
+
+ auto result = mSoundDoseWrapper->mSoundDoseFactory->getSoundDose(
+ module, &mSoundDoseWrapper->mSoundDose);
+ if (!result.isOk()) {
+ ALOGW("%s could not get sound dose interface: %s", __func__, result.getMessage());
+ return BAD_VALUE;
+ }
+
+ if (mSoundDoseWrapper->mSoundDose == nullptr) {
+ ALOGW("%s standalone sound dose interface is not implemented", __func__);
+ *soundDoseBinder = nullptr;
+ return OK;
+ }
+
+ *soundDoseBinder = mSoundDoseWrapper->mSoundDose->asBinder();
+ ALOGI("%s using standalone sound dose interface", __func__);
+ return OK;
+}
+#else
+status_t DeviceHalHidl::getSoundDoseInterface(const std::string& module,
+ ::ndk::SpAIBinder* soundDoseBinder) {
+ (void)module; // avoid unused param
+ (void)soundDoseBinder; // avoid unused param
+ return INVALID_OPERATION;
+}
+#endif
+
} // namespace android