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
commitbd38397bc4f754c040d4abf5435c2469c3357924 (patch)
treee1a224a6cfb0af068037491a02e562eaf371804e /include
parent8495359382bc7c94a776e51c596e807448796476 (diff)
parent3d2d155a87cdd3038a2e6df8741181431cb250e1 (diff)
downloadframeworks_base-bd38397bc4f754c040d4abf5435c2469c3357924.zip
frameworks_base-bd38397bc4f754c040d4abf5435c2469c3357924.tar.gz
frameworks_base-bd38397bc4f754c040d4abf5435c2469c3357924.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
};