summaryrefslogtreecommitdiffstats
path: root/media/java
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2009-12-07 11:06:15 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-12-07 11:06:15 -0800
commite30bae7f8ef0489788c155ae44d9a57beca1acf5 (patch)
tree98465b7b940045a5b77b353d5fd99cba2d13e701 /media/java
parenta3d15d3b01146df40e72d67b79dd1f9368398f23 (diff)
parentb8341cf7c8b0b4af14ea87a4c2335e28865adff1 (diff)
downloadframeworks_base-e30bae7f8ef0489788c155ae44d9a57beca1acf5.zip
frameworks_base-e30bae7f8ef0489788c155ae44d9a57beca1acf5.tar.gz
frameworks_base-e30bae7f8ef0489788c155ae44d9a57beca1acf5.tar.bz2
am b8341cf7: am 6d42d806: Merge change I9cc489a2 into eclair
Merge commit 'b8341cf7c8b0b4af14ea87a4c2335e28865adff1' into eclair-mr2-plus-aosp * commit 'b8341cf7c8b0b4af14ea87a4c2335e28865adff1': 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();