Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac8065e9 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge d192fab5 on remote branch

Change-Id: I4bcbc77c89f734f1e11b97524f23848135feb452
parents b2f45def d192fab5
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ endif # TARGET_USES_QMAA

ifeq ($(TARGET_USES_AUDIOLITE),true)
AUDIO_USE_STUB_HAL := true
MM_AUDIO += audiolite
endif #ends TARGET_USES_AUDIOLITE

#MM_AUDIO product packages
+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ AUDIO_FEATURE_ENABLED_ICC := true
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)))
+2 −1
Original line number Diff line number Diff line
@@ -8329,7 +8329,8 @@ int adev_open_output_stream(struct audio_hw_device *dev,

    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;