summaryrefslogtreecommitdiffstats
path: root/media/java
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2009-11-04 12:05:45 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-11-04 12:05:45 -0800
commit39995fdf3104b5e7c0cf1306f1b90aea49f56cec (patch)
tree02e43d5621b8197b7b98c5f4926268062cea280f /media/java
parentb8d8bb40a1d30795b1f71ce123024a9a26cd5848 (diff)
parent7ed0ceeba54712f76e9a4f2dd4c9197d76813488 (diff)
downloadframeworks_base-39995fdf3104b5e7c0cf1306f1b90aea49f56cec.zip
frameworks_base-39995fdf3104b5e7c0cf1306f1b90aea49f56cec.tar.gz
frameworks_base-39995fdf3104b5e7c0cf1306f1b90aea49f56cec.tar.bz2
am 7ed0ceeb: Merge change I6869df3a into eclair
Merge commit '7ed0ceeba54712f76e9a4f2dd4c9197d76813488' into eclair-plus-aosp * commit '7ed0ceeba54712f76e9a4f2dd4c9197d76813488': Add new audio sources to support the A1026 recording configurations.
Diffstat (limited to 'media/java')
-rw-r--r--media/java/android/media/MediaRecorder.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/media/java/android/media/MediaRecorder.java b/media/java/android/media/MediaRecorder.java
index 9bb00c6..0b42cf6 100644
--- a/media/java/android/media/MediaRecorder.java
+++ b/media/java/android/media/MediaRecorder.java
@@ -135,6 +135,12 @@ 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 */
+ public static final int CAMCORDER = 5;
+
+ /** @hide Microphone audio source tuned for voice recognition */
+ public static final int VOICE_RECOGNITION = 6;
}
/**
@@ -274,7 +280,7 @@ public class MediaRecorder
* Gets the maximum value for audio sources.
* @see android.media.MediaRecorder.AudioSource
*/
- public static final int getAudioSourceMax() { return AudioSource.VOICE_CALL; }
+ public static final int getAudioSourceMax() { return AudioSource.VOICE_RECOGNITION; }
/**
* Sets the video source to be used for recording. If this method is not