Invert how sound trigger capture is notified
Previously, audio policy client would call an method on the sound
trigger middleware service. This has been replaced by the sound
trigger service registering a callback, in order to avoid a cyclic
dependency between the services.
Bug: 146157104
Change-Id: I876461a7650d337d6dd05fbe80efaf08f8ef20dd
Merged-In: I876461a7650d337d6dd05fbe80efaf08f8ef20dd
diff --git a/services/audiopolicy/service/Android.bp b/services/audiopolicy/service/Android.bp
index 35a4599..6ee573f 100644
--- a/services/audiopolicy/service/Android.bp
+++ b/services/audiopolicy/service/Android.bp
@@ -28,7 +28,7 @@
"libmediautils",
"libsensorprivacy",
"libutils",
- "soundtrigger_middleware-aidl-cpp",
+ "capture_state_listener-aidl-cpp",
],
static_libs: [
diff --git a/services/audiopolicy/service/AudioPolicyClientImpl.cpp b/services/audiopolicy/service/AudioPolicyClientImpl.cpp
index 5b81b9d..9fa7a53 100644
--- a/services/audiopolicy/service/AudioPolicyClientImpl.cpp
+++ b/services/audiopolicy/service/AudioPolicyClientImpl.cpp
@@ -19,7 +19,6 @@
#include "AudioPolicyService.h"
-#include <android/media/soundtrigger_middleware/ISoundTriggerMiddlewareService.h>
#include <utils/Log.h>
#include "BinderProxy.h"
@@ -242,12 +241,9 @@
return AudioSystem::newAudioUniqueId(use);
}
-void AudioPolicyService::AudioPolicyClient::setSoundTriggerCaptureState(bool active) {
- using media::soundtrigger_middleware::ISoundTriggerMiddlewareService;
-
- static BinderProxy<ISoundTriggerMiddlewareService>
- proxy("soundtrigger_middleware");
- proxy.waitServiceOrDie()->setExternalCaptureState(active);
+void AudioPolicyService::AudioPolicyClient::setSoundTriggerCaptureState(bool active)
+{
+ mAudioPolicyService->mCaptureStateNotifier.setCaptureState(active);
}
} // namespace android
diff --git a/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp b/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
index 6d79c94..9577160 100644
--- a/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
+++ b/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
@@ -1523,4 +1523,12 @@
return mAudioPolicyManager->getPreferredDeviceForStrategy(strategy, device);
}
+status_t AudioPolicyService::registerSoundTriggerCaptureStateListener(
+ const sp<media::ICaptureStateListener>& listener,
+ bool* result)
+{
+ *result = mCaptureStateNotifier.RegisterListener(listener);
+ return NO_ERROR;
+}
+
} // namespace android
diff --git a/services/audiopolicy/service/AudioPolicyService.cpp b/services/audiopolicy/service/AudioPolicyService.cpp
index cbe6eb9..d743be9 100644
--- a/services/audiopolicy/service/AudioPolicyService.cpp
+++ b/services/audiopolicy/service/AudioPolicyService.cpp
@@ -57,9 +57,13 @@
// ----------------------------------------------------------------------------
AudioPolicyService::AudioPolicyService()
- : BnAudioPolicyService(), mpAudioPolicyDev(NULL), mpAudioPolicy(NULL),
- mAudioPolicyManager(NULL), mAudioPolicyClient(NULL), mPhoneState(AUDIO_MODE_INVALID)
-{
+ : BnAudioPolicyService(),
+ mpAudioPolicyDev(NULL),
+ mpAudioPolicy(NULL),
+ mAudioPolicyManager(NULL),
+ mAudioPolicyClient(NULL),
+ mPhoneState(AUDIO_MODE_INVALID),
+ mCaptureStateNotifier(false) {
}
void AudioPolicyService::onFirstRef()
diff --git a/services/audiopolicy/service/AudioPolicyService.h b/services/audiopolicy/service/AudioPolicyService.h
index 3f24276..f77a481 100644
--- a/services/audiopolicy/service/AudioPolicyService.h
+++ b/services/audiopolicy/service/AudioPolicyService.h
@@ -34,6 +34,7 @@
#include <media/AudioPolicy.h>
#include <mediautils/ServiceUtilities.h>
#include "AudioPolicyEffects.h"
+#include "CaptureStateNotifier.h"
#include <AudioPolicyInterface.h>
#include <android/hardware/BnSensorPrivacyListener.h>
@@ -274,6 +275,10 @@
virtual status_t getVolumeGroupFromAudioAttributes(const AudioAttributes &aa,
volume_group_t &volumeGroup);
+ status_t registerSoundTriggerCaptureStateListener(
+ const sp<media::ICaptureStateListener>& listener,
+ bool* result) override;
+
virtual status_t setRttEnabled(bool enabled);
bool isCallScreenModeSupported() override;
@@ -897,6 +902,8 @@
DefaultKeyedVector< audio_port_handle_t, sp<AudioPlaybackClient> > mAudioPlaybackClients;
MediaPackageManager mPackageManager; // To check allowPlaybackCapture
+
+ CaptureStateNotifier mCaptureStateNotifier;
};
} // namespace android