commit e8d1fcfa235c7f5fdfa06d12108d392d4bf2ea18
author Linux Build Service Account <lnxbuild@localhost> Tue Feb 04 03:45:20 2020 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Feb 04 03:45:20 2020 -0800
tree 391a4d7a890d392b1d642fd3f48df62e358abd59
parent 3f4598178ef62d1f12bc7960dfcd93e880acc5b3
parent a4458deee882a94d4c92445e9f672848c982c620

Merge "policy_hal: remove references to libsoundtrigger" into av-aosp-qc.lnx.11.0

policy_hal/Android.mk

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
 

policy_hal/AudioPolicyManager.cpp

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()) {