summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-03-04 05:48:44 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-03-04 05:48:44 -0800
commit7d3cef31dda2be092a05e95a65f0d2171891bc83 (patch)
tree518fff14b8fe6c407d73780a030c5defad10264a
parent5883e00056b87f847a5005159e36d09888c787bb (diff)
parent0d4717651e727f43ce9f7bfa46e9fb87c377c99d (diff)
downloadandroid_hardware_qcom_audio-7d3cef31dda2be092a05e95a65f0d2171891bc83.tar.gz
android_hardware_qcom_audio-7d3cef31dda2be092a05e95a65f0d2171891bc83.tar.bz2
android_hardware_qcom_audio-7d3cef31dda2be092a05e95a65f0d2171891bc83.zip
Merge "hal: Fix the device disable/enable sequence for capture usecases" into av-userspace.lnx.1.0-dev.1.0
-rw-r--r--hal/audio_hw.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index e4b8a37a..0526e9ba 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -754,7 +754,8 @@ static void check_and_route_capture_usecases(struct audio_device *adev,
usecase != uc_info &&
usecase->in_snd_device != snd_device &&
((uc_info->devices & AUDIO_DEVICE_OUT_ALL_CODEC_BACKEND) &&
- ((usecase->devices & ~AUDIO_DEVICE_BIT_IN) & AUDIO_DEVICE_IN_ALL_CODEC_BACKEND)) &&
+ (((usecase->devices & ~AUDIO_DEVICE_BIT_IN) & AUDIO_DEVICE_IN_ALL_CODEC_BACKEND) ||
+ (usecase->type == VOICE_CALL))) &&
(usecase->id != USECASE_AUDIO_SPKR_CALIB_TX)) {
ALOGV("%s: Usecase (%s) is active on (%s) - disabling ..",
__func__, use_case_table[usecase->id],