am 99253d00: Merge "AudioRecorder read buffer overflow" into lmp-mr1-dev

* commit '99253d001f835a8d23c337b8dfd6a6cbc6d7a740':
  AudioRecorder read buffer overflow
This commit is contained in:
Eric Laurent
2014-11-14 19:06:27 +00:00
committed by Android Git Automerger

View File

@@ -431,7 +431,7 @@ static jint android_media_AudioRecord_readInShortArray(JNIEnv *env, jobject thi
// read the new audio data from the native AudioRecord object
const size_t recorderBuffSize = lpRecorder->frameCount()*lpRecorder->frameSize();
const size_t sizeInBytes = sizeInShorts * sizeof(short);
ssize_t readSize = lpRecorder->read(recordBuff + offsetInShorts * sizeof(short),
ssize_t readSize = lpRecorder->read(recordBuff + offsetInShorts,
sizeInBytes > recorderBuffSize ?
recorderBuffSize : sizeInBytes);