diff options
| author | Eric Laurent <elaurent@google.com> | 2009-11-02 12:40:28 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-02 12:40:28 -0800 |
| commit | 9ff884b58a3947ee418619aaad8c62f4303c435a (patch) | |
| tree | 2db90041810de682eab57e22876298c310b8f219 /include | |
| parent | 85f1296e29d99b571fdb2e58f05f809faeae6065 (diff) | |
| parent | 90b75fbd19571784c8ceee4841a28b8333a8198e (diff) | |
| download | frameworks_av-9ff884b58a3947ee418619aaad8c62f4303c435a.zip frameworks_av-9ff884b58a3947ee418619aaad8c62f4303c435a.tar.gz frameworks_av-9ff884b58a3947ee418619aaad8c62f4303c435a.tar.bz2 | |
am ee98c240: Merge change I73680cd9 into eclair
Merge commit 'ee98c24020c1634b02cde6d333968f04a0de941f' into eclair-plus-aosp
* commit 'ee98c24020c1634b02cde6d333968f04a0de941f':
Fix 2194140: [Passion] Support Audience chip.
Diffstat (limited to 'include')
| -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 a7c8a0a..e066177 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 13316a9..d8ab63d 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 }; |