diff options
| author | Eric Laurent <elaurent@google.com> | 2015-06-10 00:47:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-10 00:47:39 +0000 |
| commit | e1c3cf01a58e45ec3784a1e877e16ce9ef7f6d1c (patch) | |
| tree | 2989aeba964adddbfa7295d84ede80817b2ac4b7 /services/audiopolicy | |
| parent | 6021de00076de9e358b3d557b58f79d7bb067ecd (diff) | |
| parent | a20d4fa431d1091abf66f9d426ef0cf441db6623 (diff) | |
| download | frameworks_av-e1c3cf01a58e45ec3784a1e877e16ce9ef7f6d1c.zip frameworks_av-e1c3cf01a58e45ec3784a1e877e16ce9ef7f6d1c.tar.gz frameworks_av-e1c3cf01a58e45ec3784a1e877e16ce9ef7f6d1c.tar.bz2 | |
Merge "audio policy: route media to BT SCO in call" into mnc-dev
Diffstat (limited to 'services/audiopolicy')
| -rwxr-xr-x | services/audiopolicy/enginedefault/src/Engine.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/services/audiopolicy/enginedefault/src/Engine.cpp b/services/audiopolicy/enginedefault/src/Engine.cpp index 50f1609..7a785eb 100755 --- a/services/audiopolicy/enginedefault/src/Engine.cpp +++ b/services/audiopolicy/enginedefault/src/Engine.cpp @@ -498,6 +498,10 @@ audio_devices_t Engine::getDeviceForStrategy(routing_strategy strategy) const device2 = availableOutputDevices.types() & AUDIO_DEVICE_OUT_REMOTE_SUBMIX; } } + if (isInCall() && (strategy == STRATEGY_MEDIA)) { + device = getDeviceForStrategy(STRATEGY_PHONE); + break; + } if ((device2 == AUDIO_DEVICE_NONE) && (mForceUse[AUDIO_POLICY_FORCE_FOR_MEDIA] != AUDIO_POLICY_FORCE_NO_BT_A2DP) && (outputs.getA2dpOutput() != 0)) { |