diff options
| author | 2009-11-02 12:51:05 -0800 | |
|---|---|---|
| committer | 2009-11-02 12:51:05 -0800 | |
| commit | 2926bf7d9aca0097a347ce6b77fc762f309a597b (patch) | |
| tree | 1fe3ce59f1d7c9f31a526b1af7f81cf4ffa44cdf | |
| parent | a94da0e7d98cdeae65cd48d4e7cfcf8f8b9aacfb (diff) | |
| parent | c69e7516482aae626eb550f5dd99f0f2f7a45909 (diff) | |
am c69e7516: am ee98c240: Merge change I73680cd9 into eclair
Merge commit 'c69e7516482aae626eb550f5dd99f0f2f7a45909' into eclair-mr2-plus-aosp
* commit 'c69e7516482aae626eb550f5dd99f0f2f7a45909':
Fix 2194140: [Passion] Support Audience chip.
| -rw-r--r-- | include/media/AudioSystem.h | 3 | ||||
| -rw-r--r-- | include/media/mediarecorder.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h index a7c8a0a7bd2f..e0661778c3e3 100644 --- a/include/media/AudioSystem.h +++ b/include/media/AudioSystem.h @@ -257,11 +257,12 @@ public: DEVICE_IN_WIRED_HEADSET = 0x100000, DEVICE_IN_AUX_DIGITAL = 0x200000, DEVICE_IN_VOICE_CALL = 0x400000, + DEVICE_IN_BACK_MIC = 0x800000, DEVICE_IN_DEFAULT = 0x80000000, DEVICE_IN_ALL = (DEVICE_IN_COMMUNICATION | DEVICE_IN_AMBIENT | DEVICE_IN_BUILTIN_MIC | DEVICE_IN_BLUETOOTH_SCO_HEADSET | DEVICE_IN_WIRED_HEADSET | DEVICE_IN_AUX_DIGITAL | - DEVICE_IN_VOICE_CALL| DEVICE_IN_DEFAULT) + DEVICE_IN_VOICE_CALL | DEVICE_IN_BACK_MIC | DEVICE_IN_DEFAULT) }; // device connection states used for setDeviceConnectionState() diff --git a/include/media/mediarecorder.h b/include/media/mediarecorder.h index 13316a9339d3..d8ab63d6092f 100644 --- a/include/media/mediarecorder.h +++ b/include/media/mediarecorder.h @@ -41,7 +41,8 @@ enum audio_source { AUDIO_SOURCE_VOICE_UPLINK = 2, AUDIO_SOURCE_VOICE_DOWNLINK = 3, AUDIO_SOURCE_VOICE_CALL = 4, - AUDIO_SOURCE_MAX = AUDIO_SOURCE_VOICE_CALL, + AUDIO_SOURCE_CAMCORDER = 5, + AUDIO_SOURCE_MAX = AUDIO_SOURCE_CAMCORDER, AUDIO_SOURCE_LIST_END // must be last - used to validate audio source type }; |