diff options
| author | Eric Laurent <elaurent@google.com> | 2014-06-12 18:38:45 -0700 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2014-06-13 08:56:56 -0700 |
| commit | 3bcffa136909c1fb6e88ee4efd12ccac18360a85 (patch) | |
| tree | 6aedd2a1ead0fa545a93229fa2965477ec627de7 /media/libmedia/AudioRecord.cpp | |
| parent | 0ac53364b79dc72ee0c09f0efc46a22ab4374dbf (diff) | |
| download | frameworks_av-3bcffa136909c1fb6e88ee4efd12ccac18360a85.zip frameworks_av-3bcffa136909c1fb6e88ee4efd12ccac18360a85.tar.gz frameworks_av-3bcffa136909c1fb6e88ee4efd12ccac18360a85.tar.bz2 | |
force command flush after releasing a reference to shared memory
After releasing a reference to a shared memory interface,
IPCThreadState::self()->flushCommands() must be called to ensure
that the corresponding reference is also cleared immediately in the
remote process. Otherwise the binder implementaiton will not
push the clear systematically causing the memory region not to be freed.
See issues 10711502 and 2801375.
Bug: 14057166.
Change-Id: If55f36f00d452d6cf00cf83bd2fba1c8f3abcb57
Diffstat (limited to 'media/libmedia/AudioRecord.cpp')
| -rw-r--r-- | media/libmedia/AudioRecord.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/media/libmedia/AudioRecord.cpp b/media/libmedia/AudioRecord.cpp index db61e85..50b444a 100644 --- a/media/libmedia/AudioRecord.cpp +++ b/media/libmedia/AudioRecord.cpp @@ -105,6 +105,8 @@ AudioRecord::~AudioRecord() } mAudioRecord->asBinder()->unlinkToDeath(mDeathNotifier, this); mAudioRecord.clear(); + mCblkMemory.clear(); + mBufferMemory.clear(); IPCThreadState::self()->flushCommands(); AudioSystem::releaseAudioSessionId(mSessionId, -1); } @@ -546,9 +548,10 @@ status_t AudioRecord::openRecord_l(size_t epoch) mDeathNotifier.clear(); } mAudioRecord = record; - mCblkMemory = iMem; mBufferMemory = bufferMem; + IPCThreadState::self()->flushCommands(); + mCblk = cblk; // note that temp is the (possibly revised) value of frameCount if (temp < frameCount || (frameCount == 0 && temp == 0)) { |