summaryrefslogtreecommitdiffstats
path: root/media/libmedia/AudioRecord.cpp
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2014-11-26 00:24:52 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-26 00:24:52 +0000
commitbf14c62e7973ed793a3b00c2c67beca4484c1c7a (patch)
tree0293ab3f6cdbec518913187d77c6d13d1c47a321 /media/libmedia/AudioRecord.cpp
parent1e18795a4847e9368baa7ecee146d3901b283cd0 (diff)
parent72bf901ca905ce154fe7866f06d25a01aadcf974 (diff)
downloadframeworks_av-bf14c62e7973ed793a3b00c2c67beca4484c1c7a.zip
frameworks_av-bf14c62e7973ed793a3b00c2c67beca4484c1c7a.tar.gz
frameworks_av-bf14c62e7973ed793a3b00c2c67beca4484c1c7a.tar.bz2
am 72bf901c: Merge "audio policy: new getOutputForAttr() prototype." into lmp-mr1-dev
* commit '72bf901ca905ce154fe7866f06d25a01aadcf974': audio policy: new getOutputForAttr() prototype.
Diffstat (limited to 'media/libmedia/AudioRecord.cpp')
-rw-r--r--media/libmedia/AudioRecord.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmedia/AudioRecord.cpp b/media/libmedia/AudioRecord.cpp
index 9e7ba88..77437d1 100644
--- a/media/libmedia/AudioRecord.cpp
+++ b/media/libmedia/AudioRecord.cpp
@@ -445,7 +445,7 @@ status_t AudioRecord::openRecord_l(size_t epoch)
}
audio_io_handle_t input = AudioSystem::getInput(mInputSource, mSampleRate, mFormat,
- mChannelMask, mSessionId, mFlags);
+ mChannelMask, (audio_session_t)mSessionId, mFlags);
if (input == AUDIO_IO_HANDLE_NONE) {
ALOGE("Could not get audio input for record source %d, sample rate %u, format %#x, "
"channel mask %#x, session %d, flags %#x",