diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-12-10 14:15:03 -0800 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2014-12-10 14:15:03 -0800 |
| commit | 66b17e9dfe114ae968bfb2f8ad8325527e373c65 (patch) | |
| tree | 8069ffdd95cd722e4da206b203856d2afe23f154 /include | |
| parent | b279f5adfa2fd6f22c87b3a7106fbb62a0b9a5d2 (diff) | |
| parent | f5a968a0d0d3275dc3f69fa827ae7978999e5916 (diff) | |
| download | frameworks_av-66b17e9dfe114ae968bfb2f8ad8325527e373c65.zip frameworks_av-66b17e9dfe114ae968bfb2f8ad8325527e373c65.tar.gz frameworks_av-66b17e9dfe114ae968bfb2f8ad8325527e373c65.tar.bz2 | |
Merge commit 'f5a968a0' into mm
Change-Id: Ifd30546c11def40ad483f27c9d7baa4008fcbac3
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/AudioSystem.h | 3 | ||||
| -rw-r--r-- | include/media/IAudioPolicyService.h | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h index bf1fc1c..843a354 100644 --- a/include/media/AudioSystem.h +++ b/include/media/AudioSystem.h @@ -18,6 +18,7 @@ #define ANDROID_AUDIOSYSTEM_H_ #include <hardware/audio_effect.h> +#include <media/AudioPolicy.h> #include <media/IAudioFlingerClient.h> #include <media/IAudioPolicyServiceClient.h> #include <system/audio.h> @@ -324,6 +325,8 @@ public: static audio_mode_t getPhoneState(); + static status_t registerPolicyMixes(Vector<AudioMix> mixes, bool registration); + // ---------------------------------------------------------------------------- class AudioPortCallback : public RefBase diff --git a/include/media/IAudioPolicyService.h b/include/media/IAudioPolicyService.h index 3e4b873..c98c475 100644 --- a/include/media/IAudioPolicyService.h +++ b/include/media/IAudioPolicyService.h @@ -25,6 +25,7 @@ #include <utils/Errors.h> #include <binder/IInterface.h> #include <media/AudioSystem.h> +#include <media/AudioPolicy.h> #include <media/IAudioPolicyServiceClient.h> #include <system/audio_policy.h> @@ -150,6 +151,8 @@ public: virtual status_t releaseSoundTriggerSession(audio_session_t session) = 0; virtual audio_mode_t getPhoneState() = 0; + + virtual status_t registerPolicyMixes(Vector<AudioMix> mixes, bool registration) = 0; }; |