diff options
author | Glenn Kasten <gkasten@google.com> | 2013-09-12 15:13:44 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-12 15:13:45 +0000 |
commit | dc33c542351449ceee95cc50a9009f495e7c72ba (patch) | |
tree | 0f44c9770a45605876de1e051801bee5781a56ad | |
parent | efc4d4899e03fb8464017dd48539106cec2163de (diff) | |
parent | 0c72b24f91c68442eb374bd1b338c394105b8262 (diff) | |
download | frameworks_av-dc33c542351449ceee95cc50a9009f495e7c72ba.zip frameworks_av-dc33c542351449ceee95cc50a9009f495e7c72ba.tar.gz frameworks_av-dc33c542351449ceee95cc50a9009f495e7c72ba.tar.bz2 |
Merge "Fix AudioTrack shared memory leak" into klp-dev
-rw-r--r-- | services/audioflinger/PlaybackTracks.h | 5 | ||||
-rw-r--r-- | services/audioflinger/Tracks.cpp | 10 |
2 files changed, 14 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, diff --git a/services/audioflinger/Tracks.cpp b/services/audioflinger/Tracks.cpp index 821e4a5..3a5dc35 100644 --- a/services/audioflinger/Tracks.cpp +++ b/services/audioflinger/Tracks.cpp @@ -364,6 +364,16 @@ AudioFlinger::PlaybackThread::Track::Track( AudioFlinger::PlaybackThread::Track::~Track() { ALOGV("PlaybackThread::Track destructor"); + + // The destructor would clear mSharedBuffer, + // but it will not push the decremented reference count, + // leaving the client's IMemory dangling indefinitely. + // This prevents that leak. + if (mSharedBuffer != 0) { + mSharedBuffer.clear(); + // flush the binder command buffer + IPCThreadState::self()->flushCommands(); + } } void AudioFlinger::PlaybackThread::Track::destroy() |