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

Commit 07811789 authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "audio policy: fix build with USE_LEGACY_AUDIO_POLICY" into lmp-dev

parents 5bee844f f380677f

services/audiopolicy/AudioPolicyClientImplLegacy.cpp

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static audio_io_handle_t open_output(audio_module_handle_t module, 
        *pFormat = config.format;

        *pChannelMask = config.channel_mask;

        if (offloadInfo != NULL) {

            *offloadInfo = config.offload_info;

            *((audio_offload_info_t *)offloadInfo) = config.offload_info;

        }

    }

    return output;

services/audiopolicy/AudioPolicyInterfaceImplLegacy.cpp

+2 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <system/audio.h>

#include <system/audio_policy.h>

#include <hardware/audio_policy.h>

#include <media/AudioPolicyHelper.h>



namespace android {
@@ -525,7 +526,7 @@ status_t AudioPolicyService::setAudioPortConfig(const struct audio_port_config * 
    return INVALID_OPERATION;

}



audio_io_handle_t AudioPolicyService::getOutputForAttr(const audio_attributes_t *attr __unused,

audio_io_handle_t AudioPolicyService::getOutputForAttr(const audio_attributes_t *attr,

                                    uint32_t samplingRate,

                                    audio_format_t format,

                                    audio_channel_mask_t channelMask,