commit ac8065e9e5574391aecf074fceddabbaf2bc2b36
author Linux Build Service Account <lnxbuild@localhost> Fri Apr 12 08:30:56 2024 -0700
committer Linux Build Service Account <lnxbuild@localhost> Fri Apr 12 08:30:56 2024 -0700
tree be0f7d3c49bd937e7332d8f3446f097b492c1a5a
parent b2f45def29f53b6be2f9215c550601de3daf7fed
parent d192fab5b7a7df3fe2cc1650dfa19b55e027c5d8

Merge d192fab5b7a7df3fe2cc1650dfa19b55e027c5d8 on remote branch

Change-Id: I4bcbc77c89f734f1e11b97524f23848135feb452

configs/audio_vendor_product.mk

diff --git a/configs/audio_vendor_product.mk b/configs/audio_vendor_product.mk
index 32fbcb4..5ff7b05 100644
--- a/configs/audio_vendor_product.mk
+++ b/configs/audio_vendor_product.mk
@@ -7,6 +7,7 @@
 
 ifeq ($(TARGET_USES_AUDIOLITE),true)
 AUDIO_USE_STUB_HAL := true
+MM_AUDIO += audiolite
 endif #ends TARGET_USES_AUDIOLITE
 
 #MM_AUDIO product packages

configs/msmnile_au/msmnile_au.mk

diff --git a/configs/msmnile_au/msmnile_au.mk b/configs/msmnile_au/msmnile_au.mk
index 08022b5..9e539aa 100644
--- a/configs/msmnile_au/msmnile_au.mk
+++ b/configs/msmnile_au/msmnile_au.mk
@@ -140,7 +140,7 @@
 ifneq ( ,$(filter T Tiramisu 13 U UpsideDownCake 14, $(PLATFORM_VERSION)))
 AUDIO_FEATURE_ENABLED_POWER_POLICY := true
 endif
-ifneq ( ,$(filter msmnile_gvmq msmnile_au gen4_au msmnile_au_km4 msmnile_au_ar msmnile_gvmq_vcu, $(TARGET_BOARD_PLATFORM)$(TARGET_BOARD_SUFFIX)$(TARGET_BOARD_DERIVATIVE_SUFFIX)))
+ifneq ( ,$(filter msmnile_gvmq msmnile_au gen4_au msmnile_au_km4 msmnile_au_ar msmnile_gvmq_vcu msmnile_gvmq_s_u, $(TARGET_BOARD_PLATFORM)$(TARGET_BOARD_SUFFIX)$(TARGET_BOARD_DERIVATIVE_SUFFIX)))
 AUDIO_FEATURE_ENABLED_AUDIO_PARSERS := true
 endif
 ifneq ( ,$(filter msmnile_tb, $(TARGET_PRODUCT)))

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 860e38c..9635c2e 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -8329,7 +8329,8 @@
 
     if (direct_dev &&
         (audio_is_linear_pcm(out->format) ||
-         config->format == AUDIO_FORMAT_DEFAULT)) {
+         config->format == AUDIO_FORMAT_DEFAULT) &&
+        out->flags == AUDIO_OUTPUT_FLAG_NONE) {
         audio_format_t req_format = config->format;
         audio_channel_mask_t req_channel_mask = config->channel_mask;
         uint32_t req_sample_rate = config->sample_rate;