diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2009-11-18 17:04:41 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-18 17:04:41 -0800 |
| commit | e78c72663eb8450614bbac653a99c83888bbb90c (patch) | |
| tree | 86cf0a68f4413dcd1758fbad54de1aee19372999 /media/java | |
| parent | 8cfccb1514b1c72dc6acbe4f96ead454ebbbeaa3 (diff) | |
| parent | a0e37e9defea04e8c0d97828db02361fe511c53f (diff) | |
| download | frameworks_base-e78c72663eb8450614bbac653a99c83888bbb90c.zip frameworks_base-e78c72663eb8450614bbac653a99c83888bbb90c.tar.gz frameworks_base-e78c72663eb8450614bbac653a99c83888bbb90c.tar.bz2 | |
am a0e37e9d: Merge change I941136fd into eclair
Merge commit 'a0e37e9defea04e8c0d97828db02361fe511c53f' into eclair-plus-aosp
* commit 'a0e37e9defea04e8c0d97828db02361fe511c53f':
Fix bug 2271468 Update the javadoc for MediaRecorder.AudioSource
Diffstat (limited to 'media/java')
| -rw-r--r-- | media/java/android/media/MediaRecorder.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/media/java/android/media/MediaRecorder.java b/media/java/android/media/MediaRecorder.java index 4203cba..15e35010 100644 --- a/media/java/android/media/MediaRecorder.java +++ b/media/java/android/media/MediaRecorder.java @@ -136,10 +136,12 @@ public class MediaRecorder /** Voice call uplink + downlink audio source */ public static final int VOICE_CALL = 4; - /** Microphone audio source with same orientation as camera */ + /** Microphone audio source with same orientation as camera if available, the main + * device microphone otherwise */ public static final int CAMCORDER = 5; - /** Microphone audio source tuned for voice recognition */ + /** Microphone audio source tuned for voice recognition if available, behaves like + * {@link #DEFAULT} otherwise. */ public static final int VOICE_RECOGNITION = 6; } |