Merge "audio-hal: AudioEffect reply overflow" into audio-hal.lnx.8.0.c7
diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 34fa238..6b2c0e4 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -33,6 +33,8 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #define LOG_TAG "audio_hw_primary"
@@ -8000,8 +8002,7 @@
         if (!voice_extn_is_compress_voip_supported()) {
             if (out->sample_rate == 8000 || out->sample_rate == 16000 ||
              out->sample_rate == 32000 || out->sample_rate == 48000) {
-                out->channel_mask = audio_extn_utils_is_vendor_enhanced_fwk() ?
-                                        config->channel_mask : AUDIO_CHANNEL_OUT_STEREO;
+                out->channel_mask = config->channel_mask;
                 out->usecase = USECASE_AUDIO_PLAYBACK_VOIP;
                 out->format = AUDIO_FORMAT_PCM_16_BIT;
                 out->volume_l = INVALID_OUT_VOLUME;