diff options
| author | Eric Laurent <elaurent@google.com> | 2014-08-05 19:54:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-05 17:41:31 +0000 |
| commit | 85c3773092cad9f2c6130ee83e8a78222bac6a0b (patch) | |
| tree | 36d7c3beb52629982d6c8048c6296e1051fe50bb /media/libmedia/AudioSystem.cpp | |
| parent | ccad786f3497f223cbc5af981b08b460433ee622 (diff) | |
| parent | df3dc7e2fe6c639529b70e3f3a7d2bf0f4c6e871 (diff) | |
| download | frameworks_av-85c3773092cad9f2c6130ee83e8a78222bac6a0b.zip frameworks_av-85c3773092cad9f2c6130ee83e8a78222bac6a0b.tar.gz frameworks_av-85c3773092cad9f2c6130ee83e8a78222bac6a0b.tar.bz2 | |
Merge "Add sound trigger control by audio policy" into lmp-dev
Diffstat (limited to 'media/libmedia/AudioSystem.cpp')
| -rw-r--r-- | media/libmedia/AudioSystem.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/media/libmedia/AudioSystem.cpp b/media/libmedia/AudioSystem.cpp index 365a594..172b056 100644 --- a/media/libmedia/AudioSystem.cpp +++ b/media/libmedia/AudioSystem.cpp @@ -913,6 +913,21 @@ void AudioSystem::setAudioPortCallback(sp<AudioPortCallback> callBack) gAudioPortCallback = callBack; } +status_t AudioSystem::acquireSoundTriggerSession(audio_session_t *session, + audio_io_handle_t *ioHandle, + audio_devices_t *device) +{ + const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service(); + if (aps == 0) return PERMISSION_DENIED; + return aps->acquireSoundTriggerSession(session, ioHandle, device); +} + +status_t AudioSystem::releaseSoundTriggerSession(audio_session_t session) +{ + const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service(); + if (aps == 0) return PERMISSION_DENIED; + return aps->releaseSoundTriggerSession(session); +} // --------------------------------------------------------------------------- void AudioSystem::AudioPolicyServiceClient::binderDied(const wp<IBinder>& who __unused) |