commit 606fbc1030d686bf1f8dc03d14a79342aca2ca41
author Glenn Kasten <gkasten@google.com> Thu Oct 22 15:28:15 2015 -0700
committer Glenn Kasten <gkasten@google.com> Thu Oct 22 15:45:03 2015 -0700
tree 0394ffc9b5ae6d11957a2123177b62a65d09d5c1
parent e710ae53001bbbf1e1afd6b3f5c3478c673afd0e

Workaround for busy wait bug

Underlying bug 25195759 is not yet fixed.

Bug: 24263351
Change-Id: I04b644246640054d38c8de79e0eb80fcbfef0e48

media/libmedia/AudioTrack.cpp

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 @@
         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;