From 5697a9b27a37dc24e83b56cc8c3019dbbae88e2b Mon Sep 17 00:00:00 2001 From: Mikhail Naganov Date: Thu, 28 Dec 2017 13:29:59 -0800 Subject: [PATCH] soundtrigger: Switch audio service to load soundtrigger 2.1 Bug: 68823037 Test: check /proc/.../maps of android.hardware.audio@2.0-service Change-Id: Ie244ca4ea548bdad8116d0a9f267bb41a6a6d50d --- audio/2.0/default/Android.mk | 2 +- audio/2.0/default/service.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/audio/2.0/default/Android.mk b/audio/2.0/default/Android.mk index aa25077898..7f42abe03e 100644 --- a/audio/2.0/default/Android.mk +++ b/audio/2.0/default/Android.mk @@ -78,7 +78,7 @@ LOCAL_SHARED_LIBRARIES := \ android.hardware.audio@2.0 \ android.hardware.audio.common@2.0 \ android.hardware.audio.effect@2.0 \ - android.hardware.soundtrigger@2.0 \ + android.hardware.soundtrigger@2.1 \ android.hardware.broadcastradio@1.0 \ android.hardware.broadcastradio@1.1 diff --git a/audio/2.0/default/service.cpp b/audio/2.0/default/service.cpp index a215108e95..4763c70dd0 100644 --- a/audio/2.0/default/service.cpp +++ b/audio/2.0/default/service.cpp @@ -16,11 +16,11 @@ #define LOG_TAG "audiohalservice" -#include -#include #include #include -#include +#include +#include +#include using android::hardware::configureRpcThreadpool; using android::hardware::joinRpcThreadpool; @@ -28,7 +28,7 @@ using android::hardware::registerPassthroughServiceImplementation; using android::hardware::audio::effect::V2_0::IEffectsFactory; using android::hardware::audio::V2_0::IDevicesFactory; -using android::hardware::soundtrigger::V2_0::ISoundTriggerHw; +using android::hardware::soundtrigger::V2_1::ISoundTriggerHw; using android::hardware::registerPassthroughServiceImplementation; using android::OK;