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

Commit 6a921902 authored by Glenn Kasten's avatar Glenn Kasten Committed by android-build-merger
Browse files

Merge "Workaround for busy wait bug" into mnc-dr-dev 

am: d34cf6d9

* commit 'd34cf6d9':
  Workaround for busy wait bug
parents 72920648 d34cf6d9

media/libmedia/AudioTrack.cpp

+2 −1
Original line number Diff line number Diff line
@@ -1980,7 +1980,8 @@ nsecs_t AudioTrack::processAudioBuffer() 
        if (err != NO_ERROR) {

            if (err == TIMED_OUT || err == WOULD_BLOCK || err == -EINTR ||

                    (isOffloaded() && (err == DEAD_OBJECT))) {

                return 0;

                // FIXME bug 25195759

                return 1000000;

            }

            ALOGE("Error %d obtaining an audio buffer, giving up.", err);

            return NS_NEVER;