hal: handle combo output devices for voice call
- Issues: camera shutter sound is not heard on
speaker when wired headset is connected.
- Rootcause: combo output devices are not updated
properly for voice call use cases.
- Fix: update combo devices before voice call use
cases in platform_get_output_snd_device.
CRs-Fixed: 591822
Change-Id: Ic2e75a4ce25f77499c07b4a8a32af774cdea16c2
diff --git a/policy_hal/AudioPolicyManager.cpp b/policy_hal/AudioPolicyManager.cpp
index d44a251..f64bbfe 100644
--- a/policy_hal/AudioPolicyManager.cpp
+++ b/policy_hal/AudioPolicyManager.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.
* Not a contribution.
*
* Copyright (C) 2009 The Android Open Source Project
@@ -590,7 +590,7 @@
case STRATEGY_MEDIA: {
uint32_t device2 = AUDIO_DEVICE_NONE;
- if (isInCall()) {
+ if (isInCall() && (device == AUDIO_DEVICE_NONE)) {
// when in call, get the device for Phone strategy
device = getDeviceForStrategy(STRATEGY_PHONE, false /*fromCache*/);
break;