diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-08-31 09:22:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-31 09:22:45 -0700 |
| commit | 8cd6a4a8199a84270231ca1f9212070b35e72815 (patch) | |
| tree | b76823aecd32ce3d83edef37624aa6abff768e3d /media | |
| parent | 104b1dfb4c512088c577c12367ce6337889678ff (diff) | |
| parent | a1859489b82bffbdbb68f4a00535a2fb18038379 (diff) | |
| download | frameworks_av-8cd6a4a8199a84270231ca1f9212070b35e72815.zip frameworks_av-8cd6a4a8199a84270231ca1f9212070b35e72815.tar.gz frameworks_av-8cd6a4a8199a84270231ca1f9212070b35e72815.tar.bz2 | |
am 08d8228d: am b3428f7f: Merge "Update audio comments" into jb-mr1-dev
* commit '08d8228d508adf26e1e6bdf44401ee3b7fcca22f':
Update audio comments
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmedia/AudioTrack.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp index 73d396e..362d022 100644 --- a/media/libmedia/AudioTrack.cpp +++ b/media/libmedia/AudioTrack.cpp @@ -1144,7 +1144,7 @@ status_t TimedAudioTrack::allocateTimedBuffer(size_t size, sp<IMemory>* buffer) // If the track is not invalid already, try to allocate a buffer. alloc // fails indicating that the server is dead, flag the track as invalid so - // we can attempt to restore in in just a bit. + // we can attempt to restore in just a bit. if (!(mCblk->flags & CBLK_INVALID_MSK)) { result = mAudioTrack->allocateTimedBuffer(size, buffer); if (result == DEAD_OBJECT) { |