summaryrefslogtreecommitdiffstats
path: root/media/java
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-11-05 19:03:09 -0500
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-11-05 19:03:09 -0500
commitd94ed3794c68b93ac9faa357bb3517f4fae88162 (patch)
tree37e84f253efa9d1389f437b87f55038693971762 /media/java
parentf20e9a88a36ced533e96b8873a3321b4d51585ca (diff)
parent1dc2ae2871aa3e958229e08ccf34099dff2fa402 (diff)
downloadframeworks_base-d94ed3794c68b93ac9faa357bb3517f4fae88162.zip
frameworks_base-d94ed3794c68b93ac9faa357bb3517f4fae88162.tar.gz
frameworks_base-d94ed3794c68b93ac9faa357bb3517f4fae88162.tar.bz2
Merge change I1dc2ae28 into eclair
* changes: Fix bug 2242585 to unhide the new audio recording sources. Unhide CAMCORDER and VOICE_RECOGNITION in android.media.MediaRecorder
Diffstat (limited to 'media/java')
-rw-r--r--media/java/android/media/MediaRecorder.java4
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;
}