diff options
| author | Glenn Kasten <gkasten@google.com> | 2015-10-22 23:08:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-22 23:08:47 +0000 |
| commit | d34cf6d95c9e5b2d5464a1d8704d8ba7eb059216 (patch) | |
| tree | b7182ca18dcb96894fdad365403b17f12a3908c7 /media | |
| parent | 0983d691b7b442d376628bf009299acf5247c44f (diff) | |
| parent | 606fbc1030d686bf1f8dc03d14a79342aca2ca41 (diff) | |
| download | frameworks_av-d34cf6d95c9e5b2d5464a1d8704d8ba7eb059216.zip frameworks_av-d34cf6d95c9e5b2d5464a1d8704d8ba7eb059216.tar.gz frameworks_av-d34cf6d95c9e5b2d5464a1d8704d8ba7eb059216.tar.bz2 | |
Merge "Workaround for busy wait bug" into mnc-dr-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmedia/AudioTrack.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp index d17f7ae..ff5fe1d 100644 --- a/media/libmedia/AudioTrack.cpp +++ b/media/libmedia/AudioTrack.cpp @@ -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; |