summaryrefslogtreecommitdiffstats
path: root/media/java
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2009-12-07 11:03:42 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-12-07 11:03:42 -0800
commita4dde1da5f8663fea34fe538900e78611cb48f4f (patch)
tree43bd281d2b30d4426220ccf4b29711c9a783f30a /media/java
parent6d58cf0d3d2f69a5451058b7ac5d74d59be0be54 (diff)
parent6d42d80653f2c41f3e72a878a1d9a6f9693b89f7 (diff)
downloadframeworks_base-a4dde1da5f8663fea34fe538900e78611cb48f4f.zip
frameworks_base-a4dde1da5f8663fea34fe538900e78611cb48f4f.tar.gz
frameworks_base-a4dde1da5f8663fea34fe538900e78611cb48f4f.tar.bz2
am 6d42d806: Merge change I9cc489a2 into eclair
Merge commit '6d42d80653f2c41f3e72a878a1d9a6f9693b89f7' into eclair-plus-aosp * 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/java')
-rw-r--r--media/java/android/media/AudioRecord.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/media/java/android/media/AudioRecord.java b/media/java/android/media/AudioRecord.java
index 7a47157..c48eaad 100644
--- a/media/java/android/media/AudioRecord.java
+++ b/media/java/android/media/AudioRecord.java
@@ -498,8 +498,9 @@ public class AudioRecord
// start recording
synchronized(mRecordingStateLock) {
- native_start();
- mRecordingState = RECORDSTATE_RECORDING;
+ if (native_start() == SUCCESS) {
+ mRecordingState = RECORDSTATE_RECORDING;
+ }
}
}
@@ -764,7 +765,7 @@ public class AudioRecord
private native final void native_release();
- private native final void native_start();
+ private native final int native_start();
private native final void native_stop();