diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-08-31 09:17:54 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-31 09:17:55 -0700 |
| commit | b3428f7f8ebd9b08a631889dda48bf5951ab21b6 (patch) | |
| tree | ae3b4dc7668249183c15d753f08153de3faea2f4 /media | |
| parent | dc91c885f267005e06f439a3bd592b3d8706bb50 (diff) | |
| parent | c3ae93f21280859086ae371428ffd32f39e76d50 (diff) | |
| download | frameworks_av-b3428f7f8ebd9b08a631889dda48bf5951ab21b6.zip frameworks_av-b3428f7f8ebd9b08a631889dda48bf5951ab21b6.tar.gz frameworks_av-b3428f7f8ebd9b08a631889dda48bf5951ab21b6.tar.bz2 | |
Merge "Update audio comments" into jb-mr1-dev
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) { |