summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2009-11-04 13:23:00 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-11-04 13:23:00 -0800
commit41020e23f0d4177889784afbada8adb036ba53d3 (patch)
tree8d8231a3ae4d8e753ae070512315d238a103bd37 /include
parent587e067a970fc23c707c448f508cc32e052a8380 (diff)
parent308d4aea9ccb62d3d9e3010a73b16435e554d5f2 (diff)
downloadframeworks_av-41020e23f0d4177889784afbada8adb036ba53d3.zip
frameworks_av-41020e23f0d4177889784afbada8adb036ba53d3.tar.gz
frameworks_av-41020e23f0d4177889784afbada8adb036ba53d3.tar.bz2
am 3d2d155a: am 7ed0ceeb: Merge change I6869df3a into eclair
Merge commit '3d2d155a87cdd3038a2e6df8741181431cb250e1' into eclair-mr2-plus-aosp * commit '3d2d155a87cdd3038a2e6df8741181431cb250e1': 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
};