diff options
| author | Glenn Kasten <gkasten@google.com> | 2013-09-12 09:08:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-12 09:08:49 -0700 |
| commit | 8a220740cd77eb844123d3914190a94513797b40 (patch) | |
| tree | d6f1a8ca7002608183caa7f2b63a03af65d0ba39 /services/audioflinger/PlaybackTracks.h | |
| parent | 4823964d198228289ff21530bf8b01bb2ef196bb (diff) | |
| parent | dc33c542351449ceee95cc50a9009f495e7c72ba (diff) | |
| download | frameworks_av-8a220740cd77eb844123d3914190a94513797b40.zip frameworks_av-8a220740cd77eb844123d3914190a94513797b40.tar.gz frameworks_av-8a220740cd77eb844123d3914190a94513797b40.tar.bz2 | |
am dc33c542: Merge "Fix AudioTrack shared memory leak" into klp-dev
* commit 'dc33c542351449ceee95cc50a9009f495e7c72ba':
Fix AudioTrack shared memory leak
Diffstat (limited to 'services/audioflinger/PlaybackTracks.h')
| -rw-r--r-- | services/audioflinger/PlaybackTracks.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/services/audioflinger/PlaybackTracks.h b/services/audioflinger/PlaybackTracks.h index 0308b99..f7ad6b1 100644 --- a/services/audioflinger/PlaybackTracks.h +++ b/services/audioflinger/PlaybackTracks.h @@ -117,7 +117,10 @@ protected: enum {FS_INVALID, FS_FILLING, FS_FILLED, FS_ACTIVE}; mutable uint8_t mFillingUpStatus; int8_t mRetryCount; - const sp<IMemory> mSharedBuffer; + + // see comment at AudioFlinger::PlaybackThread::Track::~Track for why this can't be const + sp<IMemory> mSharedBuffer; + bool mResetDone; const audio_stream_type_t mStreamType; int mName; // track name on the normal mixer, |