commit 2c6c5294388e251ebc1e00d6c8785190561c27fc
author Glenn Kasten <gkasten@google.com> Mon Jan 13 10:29:08 2014 -0800
committer Glenn Kasten <gkasten@google.com> Mon Jan 13 11:48:33 2014 -0800
tree 9f61bedb0d81ee785c2ea86e198d4c18d6bc84b7
parent aaa42e57797db140ead1068dce6340ffd33fa005

Fix race in AudioTrack::getParameters()

mOutput is protected by mLock.

Change-Id: Id02e627062855ca60f28bd8961b1d5f44939c727

media/libmedia/AudioTrack.cpp

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 @@
 
 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();
     }