summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2015-03-04 10:08:29 -0800
committerEric Laurent <elaurent@google.com>2015-03-04 10:08:41 -0800
commitacc930d104534dff89d5e336d22d2310069ca7c2 (patch)
tree1bd6f8f33db1549d0fe3663dbe72a7570957af35 /services
parent96faa25f4aea2c792523ae920da91f919f5ea392 (diff)
downloadframeworks_av-acc930d104534dff89d5e336d22d2310069ca7c2.zip
frameworks_av-acc930d104534dff89d5e336d22d2310069ca7c2.tar.gz
frameworks_av-acc930d104534dff89d5e336d22d2310069ca7c2.tar.bz2
audiopolicy: Do not route VoIP call to HDMI
getDeviceForStrategy is returning AUDIO_DEVICE_OUT_AUX_DIGITAL even when setForceUse is called with FORCE_NONE(earpiece) during VOIP call. Actual Intention is to route audio for phone strategy to AUX device even after setForceUse is called with FORCE_NONE when not in voice call. It is supposed to exclude VOIP call too. Bug: 19522164. Change-Id: I88d515c351f066305f9eed240b1fe5f60ef34f85
Diffstat (limited to 'services')
-rw-r--r--services/audiopolicy/managerdefault/AudioPolicyManager.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index b48dc80..53ec0f6 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -4467,7 +4467,7 @@ audio_devices_t AudioPolicyManager::getDeviceForStrategy(routing_strategy strate
if (device) break;
device = availableOutputDeviceTypes & AUDIO_DEVICE_OUT_USB_DEVICE;
if (device) break;
- if (mPhoneState != AUDIO_MODE_IN_CALL) {
+ if (!isInCall()) {
device = availableOutputDeviceTypes & AUDIO_DEVICE_OUT_USB_ACCESSORY;
if (device) break;
device = availableOutputDeviceTypes & AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET;