diff options
author | Jean-Michel Trivi <jmtrivi@google.com> | 2009-11-04 12:05:34 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-04 12:05:34 -0800 |
commit | 308d4aea9ccb62d3d9e3010a73b16435e554d5f2 (patch) | |
tree | 32377008aef5762d9bab29e77a6c3b1ea5aa53df | |
parent | 2c814adaf6340ee3cf2b942f1dff0f2ea6904c81 (diff) | |
parent | d763b9513e520c7f0113077b4a2c62cee16e4266 (diff) | |
download | frameworks_av-308d4aea9ccb62d3d9e3010a73b16435e554d5f2.zip frameworks_av-308d4aea9ccb62d3d9e3010a73b16435e554d5f2.tar.gz frameworks_av-308d4aea9ccb62d3d9e3010a73b16435e554d5f2.tar.bz2 |
am 7ed0ceeb: Merge change I6869df3a into eclair
Merge commit '7ed0ceeba54712f76e9a4f2dd4c9197d76813488' into eclair-mr2
* commit '7ed0ceeba54712f76e9a4f2dd4c9197d76813488':
Add new audio sources to support the A1026 recording configurations.
-rw-r--r-- | include/media/mediarecorder.h | 3 |
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 }; |