summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2015-03-09 21:32:54 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-03-09 21:32:54 +0000
commit50b22c7717a1af8a1f2f90858b69431a3de468b5 (patch)
tree0e8e96944089da2ee27a28459a219015adca222a /media
parent95f0de7f26c487d468ff5a3b353af7d635de6d93 (diff)
parent54a8a456c2b4b382b3ffe3d99e40703df79c0717 (diff)
downloadframeworks_av-50b22c7717a1af8a1f2f90858b69431a3de468b5.zip
frameworks_av-50b22c7717a1af8a1f2f90858b69431a3de468b5.tar.gz
frameworks_av-50b22c7717a1af8a1f2f90858b69431a3de468b5.tar.bz2
Merge "AudioTrack::releaseBuffer parameter is const *"
Diffstat (limited to 'media')
-rw-r--r--media/libmedia/AudioTrack.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp
index 3c3eadc..0713c66 100644
--- a/media/libmedia/AudioTrack.cpp
+++ b/media/libmedia/AudioTrack.cpp
@@ -1338,7 +1338,7 @@ status_t AudioTrack::obtainBuffer(Buffer* audioBuffer, const struct timespec *re
return status;
}
-void AudioTrack::releaseBuffer(Buffer* audioBuffer)
+void AudioTrack::releaseBuffer(const Buffer* audioBuffer)
{
// FIXME add error checking on mode, by adding an internal version
if (mTransfer == TRANSFER_SHARED) {