drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change I73680cd9 into eclair

Browse Source 
* changes:
  Fix 2194140: [Passion] Support Audience chip.
This commit is contained in:
Android (Google) Code Review
2009-11-02 15:34:28 -05:00
parent 989b76aadd f22a0975c4
commit ee98c24020
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/media/AudioSystem.h
View File

@ -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()

3
include/media/mediarecorder.h
View File

@ -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
};