diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-01-13 10:29:08 -0800 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2014-01-13 11:48:33 -0800 |
| commit | 2c6c5294388e251ebc1e00d6c8785190561c27fc (patch) | |
| tree | 9f61bedb0d81ee785c2ea86e198d4c18d6bc84b7 /media | |
| parent | aaa42e57797db140ead1068dce6340ffd33fa005 (diff) | |
| download | frameworks_av-2c6c5294388e251ebc1e00d6c8785190561c27fc.zip frameworks_av-2c6c5294388e251ebc1e00d6c8785190561c27fc.tar.gz frameworks_av-2c6c5294388e251ebc1e00d6c8785190561c27fc.tar.bz2 | |
Fix race in AudioTrack::getParameters()
mOutput is protected by mLock.
Change-Id: Id02e627062855ca60f28bd8961b1d5f44939c727
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmedia/AudioTrack.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp index a6ffc62..1d56788 100644 --- a/media/libmedia/AudioTrack.cpp +++ b/media/libmedia/AudioTrack.cpp @@ -1768,8 +1768,9 @@ status_t AudioTrack::getTimestamp(AudioTimestamp& timestamp) String8 AudioTrack::getParameters(const String8& keys) { - if (mOutput) { - return AudioSystem::getParameters(mOutput, keys); + audio_io_handle_t output = getOutput(); + if (output != 0) { + return AudioSystem::getParameters(output, keys); } else { return String8::empty(); } |