summaryrefslogtreecommitdiffstats
path: root/media/libmedia
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2009-12-07 11:03:17 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-12-07 11:03:17 -0800
commitb8341cf7c8b0b4af14ea87a4c2335e28865adff1 (patch)
tree1cac06cd89253fc26cb610848cb4ddc2b1b9c4be /media/libmedia
parent8e6d79e2b570d73b620a4f5a98d461329e5f2477 (diff)
parent6d42d80653f2c41f3e72a878a1d9a6f9693b89f7 (diff)
downloadframeworks_base-b8341cf7c8b0b4af14ea87a4c2335e28865adff1.zip
frameworks_base-b8341cf7c8b0b4af14ea87a4c2335e28865adff1.tar.gz
frameworks_base-b8341cf7c8b0b4af14ea87a4c2335e28865adff1.tar.bz2
am 6d42d806: Merge change I9cc489a2 into eclair
Merge commit '6d42d80653f2c41f3e72a878a1d9a6f9693b89f7' into eclair-mr2 * commit '6d42d80653f2c41f3e72a878a1d9a6f9693b89f7': Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
Diffstat (limited to 'media/libmedia')
-rw-r--r--media/libmedia/AudioRecord.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/media/libmedia/AudioRecord.cpp b/media/libmedia/AudioRecord.cpp
index c3828f0..f4165ff 100644
--- a/media/libmedia/AudioRecord.cpp
+++ b/media/libmedia/AudioRecord.cpp
@@ -125,7 +125,7 @@ status_t AudioRecord::set(
audio_io_handle_t input = AudioSystem::getInput(inputSource,
sampleRate, format, channels, (AudioSystem::audio_in_acoustics)flags);
if (input == 0) {
- LOGE("Could not get audio output for stream type %d", inputSource);
+ LOGE("Could not get audio input for record source %d", inputSource);
return BAD_VALUE;
}
@@ -539,7 +539,6 @@ ssize_t AudioRecord::read(void* buffer, size_t userSize)
return BAD_VALUE;
}
- LOGV("read size: %d", userSize);
do {