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 /include/media/AudioSystem.h | |
| 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 'include/media/AudioSystem.h')
| -rw-r--r-- | include/media/AudioSystem.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h index debfd35..b427036 100644 --- a/include/media/AudioSystem.h +++ b/include/media/AudioSystem.h @@ -226,6 +226,7 @@ public: audio_io_handle_t *output, audio_session_t session, audio_stream_type_t *stream, + uid_t uid, uint32_t samplingRate = 0, audio_format_t format = AUDIO_FORMAT_DEFAULT, audio_channel_mask_t channelMask = AUDIO_CHANNEL_OUT_STEREO, @@ -247,6 +248,7 @@ public: static status_t 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, |