diff options
author | Jean-Michel Trivi <jmtrivi@google.com> | 2009-11-05 16:10:18 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-05 16:10:18 -0800 |
commit | eb918b0da4891b90d1331081be4e9a34bd254970 (patch) | |
tree | 4e4ce1b793828c2c4023ddb529e0bf24c33b5ecd /media/java | |
parent | 35903e03ab7cc7e9ac367a404f69d6b2ac9b199f (diff) | |
parent | d94ed3794c68b93ac9faa357bb3517f4fae88162 (diff) | |
download | frameworks_base-eb918b0da4891b90d1331081be4e9a34bd254970.zip frameworks_base-eb918b0da4891b90d1331081be4e9a34bd254970.tar.gz frameworks_base-eb918b0da4891b90d1331081be4e9a34bd254970.tar.bz2 |
am d94ed379: Merge change I1dc2ae28 into eclair
Merge commit 'd94ed3794c68b93ac9faa357bb3517f4fae88162' into eclair-plus-aosp
* commit 'd94ed3794c68b93ac9faa357bb3517f4fae88162':
Fix bug 2242585 to unhide the new audio recording sources.
Diffstat (limited to 'media/java')
-rw-r--r-- | media/java/android/media/MediaRecorder.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/java/android/media/MediaRecorder.java b/media/java/android/media/MediaRecorder.java index 0b42cf6..4203cba 100644 --- a/media/java/android/media/MediaRecorder.java +++ b/media/java/android/media/MediaRecorder.java @@ -136,10 +136,10 @@ public class MediaRecorder /** Voice call uplink + downlink audio source */ public static final int VOICE_CALL = 4; - /** @hide Microphone audio source with same orientation as camera */ + /** Microphone audio source with same orientation as camera */ public static final int CAMCORDER = 5; - /** @hide Microphone audio source tuned for voice recognition */ + /** Microphone audio source tuned for voice recognition */ public static final int VOICE_RECOGNITION = 6; } |