commit aeaf96ac308270d66a6b936b84337ca8f149450e
author qctecmdr <qctecmdr@localhost> Thu Nov 14 20:15:28 2019 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Nov 14 20:15:28 2019 -0800
tree b74d49d9c41f86b09ea5692ece0c589d622421d2
parent 70cf0c0b66ccb0e30fc98a42a3d8c04b5d6c5118
parent 34574a0acd168dd94b6a6fad1fa2e6a9dfe81de5

Merge "audio hal: fix enabling snd device with same backend on the codec twice."

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 7a2c2b9..9636572 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -1764,13 +1764,13 @@
         if (usecase->type != PCM_PLAYBACK &&
                 usecase != uc_info &&
                 (usecase->in_snd_device != snd_device || force_routing) &&
-                ((uc_info->devices & backend_check_cond) &&
+                (((uc_info->devices & backend_check_cond) &&
                  (((usecase->devices & ~AUDIO_DEVICE_BIT_IN) & AUDIO_DEVICE_IN_ALL_CODEC_BACKEND) ||
-                  (usecase->type == VOIP_CALL))) &&
+                  (usecase->type == VOIP_CALL))) ||
                 ((uc_info->type == VOICE_CALL &&
                   usecase->devices == AUDIO_DEVICE_IN_VOICE_CALL) ||
                  platform_check_backends_match(snd_device,\
-                                              usecase->in_snd_device)) &&
+                                              usecase->in_snd_device))) &&
                 (usecase->id != USECASE_AUDIO_SPKR_CALIB_TX)) {
             ALOGV("%s: Usecase (%s) is active on (%s) - disabling ..",
                   __func__, use_case_table[usecase->id],