policy_hal: remove references to libsoundtrigger
libsoundtrigger was removed upstream and a new middleware service is now
in use. Reflect those changes here.
Bug: 147608992
Change-Id: I2bdc5711a3430b9fd125582570e042da1696d6e4
diff --git a/policy_hal/Android.mk b/policy_hal/Android.mk
index 60438e9..afd1a3b 100644
--- a/policy_hal/Android.mk
+++ b/policy_hal/Android.mk
@@ -27,7 +27,6 @@
libcutils \
libutils \
liblog \
- libsoundtrigger \
libaudiofoundation \
libaudiopolicymanagerdefault
diff --git a/policy_hal/AudioPolicyManager.cpp b/policy_hal/AudioPolicyManager.cpp
index a4bc087..8a0295a 100644
--- a/policy_hal/AudioPolicyManager.cpp
+++ b/policy_hal/AudioPolicyManager.cpp
@@ -43,7 +43,6 @@
#include <hardware/audio.h>
#include <hardware/audio_effect.h>
#include <media/AudioParameter.h>
-#include <soundtrigger/SoundTrigger.h>
#include "AudioPolicyManager.h"
#include <policy.h>
@@ -2080,9 +2079,9 @@
if ((primaryInputDevices.contains(device) && (device->type() & ~AUDIO_DEVICE_BIT_IN)) != 0) {
if (mApmConfigs->isVAConcEnabled()) {
if (activeNonSoundTriggerInputsCountOnDevices(deviceTypesToBitMask(primaryInputDevices.types())) == 1)
- SoundTrigger::setCaptureState(true);
+ mpClientInterface->setSoundTriggerCaptureState(true);
} else if (mInputs.activeInputsCountOnDevices(primaryInputDevices) == 1)
- SoundTrigger::setCaptureState(true);
+ mpClientInterface->setSoundTriggerCaptureState(true);
}
// automatically enable the remote submix output when input is started if not
@@ -2128,7 +2127,7 @@
sp<AudioInputDescriptor> inputDesc = mInputs.getInputForClient(portId);
if ((primaryInputDevices.contains(inputDesc->getDevice()) &&
activeNonSoundTriggerInputsCountOnDevices(deviceTypesToBitMask(primaryInputDevices.types()))) == 0) {
- SoundTrigger::setCaptureState(false);
+ mpClientInterface->setSoundTriggerCaptureState(false);
}
}
if (mApmConfigs->isRecPlayConcEnabled()) {