summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@google.com>2014-05-28 21:54:02 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-28 21:54:02 +0000
commit1afdf38e0d8979e0a6bd5f3cc9b6751ca132753e (patch)
tree6434583aecf561dc9dbed24e4167f654d50ff157 /services
parent1e5308df326522ac925086bbd7396349bbe67505 (diff)
parent41b0e2421a0cf8dc22f224ea078678d7db651bda (diff)
downloadframeworks_av-1afdf38e0d8979e0a6bd5f3cc9b6751ca132753e.zip
frameworks_av-1afdf38e0d8979e0a6bd5f3cc9b6751ca132753e.tar.gz
frameworks_av-1afdf38e0d8979e0a6bd5f3cc9b6751ca132753e.tar.bz2
Merge "Add audio policy support for A2DP sink"
Diffstat (limited to 'services')
-rw-r--r--services/audiopolicy/AudioPolicyManager.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/services/audiopolicy/AudioPolicyManager.cpp b/services/audiopolicy/AudioPolicyManager.cpp
index b047e1d..db0f57d 100644
--- a/services/audiopolicy/AudioPolicyManager.cpp
+++ b/services/audiopolicy/AudioPolicyManager.cpp
@@ -100,6 +100,7 @@ const StringToEnum sDeviceNameToEnumTable[] = {
STRING_TO_ENUM(AUDIO_DEVICE_IN_TV_TUNER),
STRING_TO_ENUM(AUDIO_DEVICE_IN_LINE),
STRING_TO_ENUM(AUDIO_DEVICE_IN_SPDIF),
+ STRING_TO_ENUM(AUDIO_DEVICE_IN_BLUETOOTH_A2DP),
};
const StringToEnum sFlagNameToEnumTable[] = {
@@ -3164,6 +3165,12 @@ audio_devices_t AudioPolicyManager::getDeviceForInputSource(audio_source_t input
case AUDIO_SOURCE_DEFAULT:
case AUDIO_SOURCE_MIC:
+ if (availableDeviceTypes & AUDIO_DEVICE_IN_BLUETOOTH_A2DP) {
+ device = AUDIO_DEVICE_IN_BLUETOOTH_A2DP;
+ break;
+ }
+ // FALL THROUGH
+
case AUDIO_SOURCE_VOICE_RECOGNITION:
case AUDIO_SOURCE_HOTWORD:
case AUDIO_SOURCE_VOICE_COMMUNICATION: