commit 0a2f151f37c715078351ae0be99b0c4dbabc2a23
author Glenn Kasten <gkasten@google.com> Fri Jul 22 08:06:37 2016 -0700
committer Glenn Kasten <gkasten@google.com> Fri Jul 22 08:06:37 2016 -0700
tree 837f0234dd3a5836512f85971f72072a59167afe
parent 00bbc1d5ee0ad847ed07a273d103e2996862e98b

Fix AudioRecord::read and AudioTrack::write return

value to only be one of the documented status codes.

Bug: 30158307
Change-Id: If1ba16ce2ee10ba5ccb1674003a4b8fa086f27bc

media/libmedia/AudioRecord.cpp

diff --git a/media/libmedia/AudioRecord.cpp b/media/libmedia/AudioRecord.cpp
index 9a87023..b172747 100644
--- a/media/libmedia/AudioRecord.cpp
+++ b/media/libmedia/AudioRecord.cpp
@@ -891,6 +891,9 @@
             if (read > 0) {
                 break;
             }
+            if (err == TIMED_OUT || err == -EINTR) {
+                err = WOULD_BLOCK;
+            }
             return ssize_t(err);
         }
 

media/libmedia/AudioTrack.cpp

diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp
index fad8350..68a47a3 100644
--- a/media/libmedia/AudioTrack.cpp
+++ b/media/libmedia/AudioTrack.cpp
@@ -1739,6 +1739,9 @@
             if (written > 0) {
                 break;
             }
+            if (err == TIMED_OUT || err == -EINTR) {
+                err = WOULD_BLOCK;
+            }
             return ssize_t(err);
         }