commit 84fba38b60c2ddb02b9a787f56be88fc084b4a16
author Glenn Kasten <gkasten@google.com> Tue Jan 14 20:36:18 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 14 20:36:18 2014 +0000
tree 93537d89d01de689dd05d21d52181a6faf06950a
parent 7e47f25f9031e231f5fdbbb789435485d1af45af
parent 2c6c5294388e251ebc1e00d6c8785190561c27fc

Merge "Fix race in AudioTrack::getParameters()"

media/libmedia/AudioTrack.cpp

diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp
index f9d335f..50e394b 100644
--- a/media/libmedia/AudioTrack.cpp
+++ b/media/libmedia/AudioTrack.cpp
@@ -1770,8 +1770,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();
     }