diff options
| author | Eric Laurent <elaurent@google.com> | 2014-12-16 21:32:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-16 21:32:55 +0000 |
| commit | be845fce36a65139eb353ba7442eba951b1ebee3 (patch) | |
| tree | 50416eb5c99ea123f82235f443d57464356e41ba /services/audiopolicy | |
| parent | cd71a69d922eab2929faf8f5652fcd1b9a29cbe8 (diff) | |
| parent | dc136ffee31f21da3b31240f8a22d4d08a658d0d (diff) | |
| download | frameworks_av-be845fce36a65139eb353ba7442eba951b1ebee3.zip frameworks_av-be845fce36a65139eb353ba7442eba951b1ebee3.tar.gz frameworks_av-be845fce36a65139eb353ba7442eba951b1ebee3.tar.bz2 | |
Merge "audiopolicy : Fix for incorrect input device selection" into lmp-mr1-dev
Diffstat (limited to 'services/audiopolicy')
| -rw-r--r-- | services/audiopolicy/AudioPolicyManager.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/services/audiopolicy/AudioPolicyManager.cpp b/services/audiopolicy/AudioPolicyManager.cpp index d2b0bcb..488d1f3 100644 --- a/services/audiopolicy/AudioPolicyManager.cpp +++ b/services/audiopolicy/AudioPolicyManager.cpp @@ -5127,6 +5127,9 @@ audio_devices_t AudioPolicyManager::getDeviceForInputSource(audio_source_t input case AUDIO_SOURCE_MIC: if (availableDeviceTypes & AUDIO_DEVICE_IN_BLUETOOTH_A2DP) { device = AUDIO_DEVICE_IN_BLUETOOTH_A2DP; + } else if ((mForceUse[AUDIO_POLICY_FORCE_FOR_RECORD] == AUDIO_POLICY_FORCE_BT_SCO) && + (availableDeviceTypes & AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET)) { + device = AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET; } else if (availableDeviceTypes & AUDIO_DEVICE_IN_WIRED_HEADSET) { device = AUDIO_DEVICE_IN_WIRED_HEADSET; } else if (availableDeviceTypes & AUDIO_DEVICE_IN_USB_DEVICE) { |