diff options
| author | Eric Laurent <elaurent@google.com> | 2015-04-30 19:50:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-30 19:50:55 +0000 |
| commit | 5f9bf49397b36ad4ebd838aef66b83e9e9fa42bc (patch) | |
| tree | f69b635690cbc2cff9e5cfb8843e4473cc327208 /media/libmedia/AudioSystem.cpp | |
| parent | 1471e7a112aed5ff120c2b97bced9523ed39fe6c (diff) | |
| parent | 8c7e6dac6f5eb38cef627dab92eac8b38513450c (diff) | |
| download | frameworks_av-5f9bf49397b36ad4ebd838aef66b83e9e9fa42bc.zip frameworks_av-5f9bf49397b36ad4ebd838aef66b83e9e9fa42bc.tar.gz frameworks_av-5f9bf49397b36ad4ebd838aef66b83e9e9fa42bc.tar.bz2 | |
Merge "audio policy: session routes continued." into mnc-dev
Diffstat (limited to 'media/libmedia/AudioSystem.cpp')
| -rw-r--r-- | media/libmedia/AudioSystem.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/media/libmedia/AudioSystem.cpp b/media/libmedia/AudioSystem.cpp index 928856d..62d25b5 100644 --- a/media/libmedia/AudioSystem.cpp +++ b/media/libmedia/AudioSystem.cpp @@ -660,6 +660,7 @@ status_t AudioSystem::getOutputForAttr(const audio_attributes_t *attr, audio_io_handle_t *output, audio_session_t session, audio_stream_type_t *stream, + uid_t uid, uint32_t samplingRate, audio_format_t format, audio_channel_mask_t channelMask, @@ -669,7 +670,7 @@ status_t AudioSystem::getOutputForAttr(const audio_attributes_t *attr, { const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service(); if (aps == 0) return NO_INIT; - return aps->getOutputForAttr(attr, output, session, stream, + return aps->getOutputForAttr(attr, output, session, stream, uid, samplingRate, format, channelMask, flags, selectedDeviceId, offloadInfo); } @@ -704,6 +705,7 @@ void AudioSystem::releaseOutput(audio_io_handle_t output, status_t AudioSystem::getInputForAttr(const audio_attributes_t *attr, audio_io_handle_t *input, audio_session_t session, + uid_t uid, uint32_t samplingRate, audio_format_t format, audio_channel_mask_t channelMask, @@ -713,7 +715,7 @@ status_t AudioSystem::getInputForAttr(const audio_attributes_t *attr, const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service(); if (aps == 0) return NO_INIT; return aps->getInputForAttr( - attr, input, session, samplingRate, format, channelMask, flags, selectedDeviceId); + attr, input, session, uid, samplingRate, format, channelMask, flags, selectedDeviceId); } status_t AudioSystem::startInput(audio_io_handle_t input, |