summaryrefslogtreecommitdiffstats
path: root/services/audiopolicy
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2014-12-16 21:42:12 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-16 21:42:12 +0000
commit7f1295f5cf27127601ea15c31b6c144ff28d2a8b (patch)
treef8475fab450baae7d57a72e67a5fafa915d61a0b /services/audiopolicy
parent7dc7aae103c272e04a891f85235ebed60cbf2a33 (diff)
parent9632d33e21ec2631c75cc949e0c92c351fd6a447 (diff)
downloadframeworks_av-7f1295f5cf27127601ea15c31b6c144ff28d2a8b.zip
frameworks_av-7f1295f5cf27127601ea15c31b6c144ff28d2a8b.tar.gz
frameworks_av-7f1295f5cf27127601ea15c31b6c144ff28d2a8b.tar.bz2
am 9632d33e: am cd71a69d: audio: Force audio to Speaker if requested during VOIP call
* commit '9632d33e21ec2631c75cc949e0c92c351fd6a447': audio: Force audio to Speaker if requested during VOIP call
Diffstat (limited to 'services/audiopolicy')
-rw-r--r--services/audiopolicy/AudioPolicyManager.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/audiopolicy/AudioPolicyManager.cpp b/services/audiopolicy/AudioPolicyManager.cpp
index 744556d..d2b0bcb 100644
--- a/services/audiopolicy/AudioPolicyManager.cpp
+++ b/services/audiopolicy/AudioPolicyManager.cpp
@@ -4566,7 +4566,7 @@ audio_devices_t AudioPolicyManager::getDeviceForStrategy(routing_strategy strate
device = availableOutputDeviceTypes & AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER;
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_USB_DEVICE;