summaryrefslogtreecommitdiffstats
path: root/include
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 /include
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 'include')
-rw-r--r--include/media/mediarecorder.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/media/mediarecorder.h b/include/media/mediarecorder.h
index d8ab63d..8c7392b 100644
--- a/include/media/mediarecorder.h
+++ b/include/media/mediarecorder.h
@@ -42,7 +42,8 @@ enum audio_source {
AUDIO_SOURCE_VOICE_DOWNLINK = 3,
AUDIO_SOURCE_VOICE_CALL = 4,
AUDIO_SOURCE_CAMCORDER = 5,
- AUDIO_SOURCE_MAX = AUDIO_SOURCE_CAMCORDER,
+ AUDIO_SOURCE_VOICE_RECOGNITION = 6,
+ AUDIO_SOURCE_MAX = AUDIO_SOURCE_VOICE_RECOGNITION,
AUDIO_SOURCE_LIST_END // must be last - used to validate audio source type
};