diff options
author | Glenn Kasten <gkasten@google.com> | 2012-12-20 08:58:04 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-12-20 08:58:05 -0800 |
commit | e30c14b48fb9c5f47802fce32a3a1115b374b357 (patch) | |
tree | 15dea79f55777d0d58ad55be456f9ecc91162dbb /media | |
parent | 10f57df484daecc356ca1720c4ba799a8bf6761a (diff) | |
parent | 74b8adfbec4b34da7904de544f1e549e21a90426 (diff) | |
download | frameworks_av-e30c14b48fb9c5f47802fce32a3a1115b374b357.zip frameworks_av-e30c14b48fb9c5f47802fce32a3a1115b374b357.tar.gz frameworks_av-e30c14b48fb9c5f47802fce32a3a1115b374b357.tar.bz2 |
Merge "Fix bug with discarded AudioRecord::read count"
Diffstat (limited to 'media')
-rw-r--r-- | media/libmedia/AudioRecord.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libmedia/AudioRecord.cpp b/media/libmedia/AudioRecord.cpp index c2ef68c..9fda0a5 100644 --- a/media/libmedia/AudioRecord.cpp +++ b/media/libmedia/AudioRecord.cpp @@ -644,7 +644,8 @@ ssize_t AudioRecord::read(void* buffer, size_t userSize) break; } if (err == status_t(TIMED_OUT)) { - err = 0; + // return partial transfer count + return read; } return ssize_t(err); } |