commit a42520a4bea1992b2afcf8c55f76c1fad9433e54
author David Lin <dtwlin@google.com> Wed Jul 26 18:13:37 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jul 26 18:13:37 2017 +0000
tree 873e1db5b56c5476177db50f0e3f908b68e3f896
parent a07cf55e83401db32c44bf4fe0ce558882be769c
parent 8ae0c093d1e4970daefe6f76550f4db6833354cf

audio: do not check for mode_in_communication for voip flags am: 6b00c23146
am: 8ae0c093d1

Change-Id: I52b3200c39f27a453e79dd80b510d652efc40839

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index c821263..c4e7717 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -3694,9 +3694,8 @@
         out->usecase = USECASE_AUDIO_PLAYBACK_AFE_PROXY;
         out->config = pcm_config_afe_proxy_playback;
         adev->voice_tx_output = out;
-    } else if ((out->dev->mode == AUDIO_MODE_IN_COMMUNICATION) &&
-               (out->flags == (AUDIO_OUTPUT_FLAG_DIRECT |
-                               AUDIO_OUTPUT_FLAG_VOIP_RX))) {
+    } else if (out->flags == (AUDIO_OUTPUT_FLAG_DIRECT |
+                              AUDIO_OUTPUT_FLAG_VOIP_RX)) {
         uint32_t buffer_size, frame_size;
         out->supported_channel_masks[0] = AUDIO_CHANNEL_OUT_MONO;
         out->channel_mask = AUDIO_CHANNEL_OUT_MONO;
@@ -4338,7 +4337,6 @@
             in->af_period_multiplier = 1;
             ALOGV("%s: USECASE_AUDIO_RECORD_MMAP", __func__);
         } else if (in->source == AUDIO_SOURCE_VOICE_COMMUNICATION &&
-                   in->dev->mode == AUDIO_MODE_IN_COMMUNICATION &&
                    in->flags & AUDIO_INPUT_FLAG_VOIP_TX &&
                    (config->sample_rate == 8000 ||
                     config->sample_rate == 16000 ||