From 5ec48c2d4d7a8ccdea489ad4b34a7cf75480ffcc Mon Sep 17 00:00:00 2001 From: Mikhail Naganov Date: Fri, 15 Jan 2021 19:05:04 +0000 Subject: audio: Create libraries for data types in core and effect Add 'CoreUtils' library similar to 'HidlUtils' for the types specific to the core HAL. Add 'EffectUtils' library similar to 'HidlUtils' for the types specific to the effects HAL. Move into them and de-duplicate code previously scattered across the default HAL implementation and libaudiohal. Add unit tests. Removed 'AUDIO_{INPUT|OUTPUT}_FLAG_NONE' from the list of values in the XSD file to avoid additional complexity due to equivalence of this value to an empty list of flags. Bug: 142480271 Test: m android.hardware.audio@X.0-impl Test: m android.hardware.audio.effect@X.0-impl Test: atest android.hardware.audio@7.0-util_tests Test: atest android.hardware.audio.common@7.0-util_tests Test: atest android.hardware.audio.effect@7.0-util_tests Change-Id: I71a95cbe07fcc162dc6d74ff9665747a17ce5a80 --- audio/core/all-versions/default/ParametersUtil.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'audio/core/all-versions/default/ParametersUtil.cpp') diff --git a/audio/core/all-versions/default/ParametersUtil.cpp b/audio/core/all-versions/default/ParametersUtil.cpp index 694eb73aee..4d536455d4 100644 --- a/audio/core/all-versions/default/ParametersUtil.cpp +++ b/audio/core/all-versions/default/ParametersUtil.cpp @@ -15,11 +15,12 @@ */ #include "core/default/ParametersUtil.h" -#include "core/default/Conversions.h" #include "core/default/Util.h" #include +#include + namespace android { namespace hardware { namespace audio { @@ -153,7 +154,7 @@ Result ParametersUtil::setParametersImpl(const hidl_vec& context Result ParametersUtil::setParam(const char* name, const DeviceAddress& address) { audio_devices_t halDeviceType; char halDeviceAddress[AUDIO_DEVICE_MAX_ADDRESS_LEN]; - if (deviceAddressToHal(address, &halDeviceType, halDeviceAddress) != NO_ERROR) { + if (CoreUtils::deviceAddressToHal(address, &halDeviceType, halDeviceAddress) != NO_ERROR) { return Result::INVALID_ARGUMENTS; } AudioParameter params{String8(halDeviceAddress)}; -- cgit v1.2.3