Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84fba38b authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

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

parents 7e47f25f 2c6c5294

media/libmedia/AudioTrack.cpp

+3 −2
Original line number Diff line number Diff line
@@ -1770,8 +1770,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();

    }