diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-01-22 23:55:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-01-22 23:55:28 +0000 |
| commit | c44621da835f7c5dfe47822c38a151a0b3e7da33 (patch) | |
| tree | a3ed78e2c774fe06861528d4a31c529ca4a956a5 /audio | |
| parent | 73ed9171d9042e86c491517e910b92ce8180961d (diff) | |
| parent | ce8d65b5ef51defc805d0658223ffce9b2b68d50 (diff) | |
| download | android_hardware_interfaces-c44621da835f7c5dfe47822c38a151a0b3e7da33.tar.gz android_hardware_interfaces-c44621da835f7c5dfe47822c38a151a0b3e7da33.tar.bz2 android_hardware_interfaces-c44621da835f7c5dfe47822c38a151a0b3e7da33.zip | |
Merge "soundtrigger: Fall back to V2.0 if V2.1 is not present"
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/2.0/default/Android.mk | 5 | ||||
| -rw-r--r-- | audio/2.0/default/service.cpp | 10 |
2 files changed, 9 insertions, 6 deletions
diff --git a/audio/2.0/default/Android.mk b/audio/2.0/default/Android.mk index c1f1a25ec..12713d303 100644 --- a/audio/2.0/default/Android.mk +++ b/audio/2.0/default/Android.mk @@ -39,9 +39,8 @@ LOCAL_SHARED_LIBRARIES := \ android.hardware.audio@2.0 \ android.hardware.audio.common@2.0 \ android.hardware.audio.effect@2.0 \ - android.hardware.soundtrigger@2.1 \ - android.hardware.broadcastradio@1.0 \ - android.hardware.broadcastradio@1.1 + android.hardware.soundtrigger@2.0 \ + android.hardware.soundtrigger@2.1 # Can not switch to Android.bp until AUDIOSERVER_MULTILIB # is deprecated as build config variable are not supported diff --git a/audio/2.0/default/service.cpp b/audio/2.0/default/service.cpp index 4763c70dd..3cf713425 100644 --- a/audio/2.0/default/service.cpp +++ b/audio/2.0/default/service.cpp @@ -18,6 +18,7 @@ #include <android/hardware/audio/2.0/IDevicesFactory.h> #include <android/hardware/audio/effect/2.0/IEffectsFactory.h> +#include <android/hardware/soundtrigger/2.0/ISoundTriggerHw.h> #include <android/hardware/soundtrigger/2.1/ISoundTriggerHw.h> #include <hidl/HidlTransportSupport.h> #include <hidl/LegacySupport.h> @@ -28,7 +29,8 @@ using android::hardware::registerPassthroughServiceImplementation; using android::hardware::audio::effect::V2_0::IEffectsFactory; using android::hardware::audio::V2_0::IDevicesFactory; -using android::hardware::soundtrigger::V2_1::ISoundTriggerHw; +using V2_0_ISoundTriggerHw = android::hardware::soundtrigger::V2_0::ISoundTriggerHw; +using V2_1_ISoundTriggerHw = android::hardware::soundtrigger::V2_1::ISoundTriggerHw; using android::hardware::registerPassthroughServiceImplementation; using android::OK; @@ -41,8 +43,10 @@ int main(int /* argc */, char* /* argv */ []) { status = registerPassthroughServiceImplementation<IEffectsFactory>(); LOG_ALWAYS_FATAL_IF(status != OK, "Error while registering audio effects service: %d", status); // Soundtrigger might be not present. - status = registerPassthroughServiceImplementation<ISoundTriggerHw>(); - ALOGE_IF(status != OK, "Error while registering soundtrigger service: %d", status); + status = registerPassthroughServiceImplementation<V2_1_ISoundTriggerHw>(); + ALOGW_IF(status != OK, "Registering soundtrigger V2.1 service was unsuccessful: %d", status); + status = registerPassthroughServiceImplementation<V2_0_ISoundTriggerHw>(); + ALOGW_IF(status != OK, "Registering soundtrigger V2.0 service was unsuccessful: %d", status); joinRpcThreadpool(); return status; } |