commit 1ef846b2d6850621f77f74ad024fb11fdc8bbee4
author Ytai Ben-Tsvi <ytai@google.com> Thu Mar 26 09:41:15 2020 -0700
committer Ytai Ben-Tsvi <ytai@google.com> Tue Mar 31 15:15:46 2020 -0700
tree 42fba4ae8410848725cdcc456514a817ab161cd4
parent e3b67fb179dc36582f27ca442d00c553ec4c2556

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

services/audiopolicy/service/AudioPolicyService.h

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