diff options
| author | Eric Laurent <elaurent@google.com> | 2015-03-04 18:11:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-04 18:11:20 +0000 |
| commit | 60d5023f92f344d1c4e72d8b1eee54a1d014f36c (patch) | |
| tree | ed1088df59b9e68ebda21036d7578edf3171db03 /services | |
| parent | 32580ec89077947274bd161b379ab0410838dd8e (diff) | |
| parent | acc930d104534dff89d5e336d22d2310069ca7c2 (diff) | |
| download | frameworks_av-60d5023f92f344d1c4e72d8b1eee54a1d014f36c.zip frameworks_av-60d5023f92f344d1c4e72d8b1eee54a1d014f36c.tar.gz frameworks_av-60d5023f92f344d1c4e72d8b1eee54a1d014f36c.tar.bz2 | |
Merge "audiopolicy: Do not route VoIP call to HDMI"
Diffstat (limited to 'services')
| -rw-r--r-- | services/audiopolicy/managerdefault/AudioPolicyManager.cpp | 2 |
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; |