diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-11-02 15:34:28 -0500 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-11-02 15:34:28 -0500 |
commit | ee98c24020c1634b02cde6d333968f04a0de941f (patch) | |
tree | c5335abd97474e43b86c4b7fb78e7ddc8a6969b6 /include | |
parent | 989b76aadd92538c7ab4ca00c34508b42fda8cef (diff) | |
parent | f22a0975c442f1f216f16db3ddb27015d72c6532 (diff) | |
download | frameworks_base-ee98c24020c1634b02cde6d333968f04a0de941f.zip frameworks_base-ee98c24020c1634b02cde6d333968f04a0de941f.tar.gz frameworks_base-ee98c24020c1634b02cde6d333968f04a0de941f.tar.bz2 |
Merge change I73680cd9 into eclair
* changes:
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 }; |