diff options
4 files changed, 12 insertions, 4 deletions
diff --git a/audio/common/all-versions/default/service/Android.mk b/audio/common/all-versions/default/service/Android.mk index 32110eec60..58987c7810 100644 --- a/audio/common/all-versions/default/service/Android.mk +++ b/audio/common/all-versions/default/service/Android.mk @@ -50,7 +50,8 @@ LOCAL_SHARED_LIBRARIES := \ android.hardware.audio.effect@5.0 \ android.hardware.bluetooth.a2dp@1.0 \ android.hardware.soundtrigger@2.0 \ - android.hardware.soundtrigger@2.1 + android.hardware.soundtrigger@2.1 \ + android.hardware.soundtrigger@2.2 # Can not switch to Android.bp until AUDIOSERVER_MULTILIB # is deprecated as build config variable are not supported diff --git a/audio/common/all-versions/default/service/service.cpp b/audio/common/all-versions/default/service/service.cpp index 7b5da814be..15ce5e0bca 100644 --- a/audio/common/all-versions/default/service/service.cpp +++ b/audio/common/all-versions/default/service/service.cpp @@ -25,6 +25,7 @@ #include <android/hardware/bluetooth/a2dp/1.0/IBluetoothAudioOffload.h> #include <android/hardware/soundtrigger/2.0/ISoundTriggerHw.h> #include <android/hardware/soundtrigger/2.1/ISoundTriggerHw.h> +#include <android/hardware/soundtrigger/2.2/ISoundTriggerHw.h> #include <binder/ProcessState.h> #include <cutils/properties.h> #include <hidl/HidlTransportSupport.h> @@ -58,9 +59,10 @@ int main(int /* argc */, char* /* argv */ []) { registerPassthroughServiceImplementation<audio::effect::V2_0::IEffectsFactory>() != OK, LOG_ALWAYS_FATAL_IF(fail, "Could not register audio effect API 2, 4 nor 5"); - fail = registerPassthroughServiceImplementation<soundtrigger::V2_1::ISoundTriggerHw>() != OK && + fail = registerPassthroughServiceImplementation<soundtrigger::V2_2::ISoundTriggerHw>() != OK && + registerPassthroughServiceImplementation<soundtrigger::V2_1::ISoundTriggerHw>() != OK && registerPassthroughServiceImplementation<soundtrigger::V2_0::ISoundTriggerHw>() != OK, - ALOGW_IF(fail, "Could not register soundtrigger API 2.0 nor 2.1"); + ALOGW_IF(fail, "Could not register soundtrigger API 2.0, 2.1 nor 2.2"); fail = registerPassthroughServiceImplementation<bluetooth::a2dp::V1_0::IBluetoothAudioOffload>() != diff --git a/compatibility_matrices/compatibility_matrix.current.xml b/compatibility_matrices/compatibility_matrix.current.xml index ceb53be8a6..6b931a0aec 100644 --- a/compatibility_matrices/compatibility_matrix.current.xml +++ b/compatibility_matrices/compatibility_matrix.current.xml @@ -374,7 +374,7 @@ </hal> <hal format="hidl" optional="true"> <name>android.hardware.soundtrigger</name> - <version>2.0-1</version> + <version>2.0-2</version> <interface> <name>ISoundTriggerHw</name> <instance>default</instance> diff --git a/soundtrigger/2.2/default/SoundTriggerHw.cpp b/soundtrigger/2.2/default/SoundTriggerHw.cpp index 3cf72c8d8e..4586544406 100644 --- a/soundtrigger/2.2/default/SoundTriggerHw.cpp +++ b/soundtrigger/2.2/default/SoundTriggerHw.cpp @@ -704,6 +704,11 @@ Return<int32_t> SoundTriggerHw::getModelState(int32_t modelHandle) { } } + if (mHwDevice->common.version < SOUND_TRIGGER_DEVICE_API_VERSION_1_2) { + ALOGE("Get model state not supported"); + return -ENODEV; + } + if (mHwDevice->get_model_state == NULL) { ALOGE("Failed to get model state from device, no such method"); return -ENODEV; |