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

Commit 52fe83f7 authored by Nadav Bar's avatar Nadav Bar Committed by Android (Google) Code Review
Browse files

Merge "Support routing audio playback to telephony uplink"

parents 7a4b8ab1 766fb020

media/libaudioclient/AudioSystem.cpp

+2 −1
Original line number Diff line number Diff line
@@ -858,6 +858,7 @@ status_t AudioSystem::getOutputForAttr(const audio_attributes_t *attr, 
                                        audio_io_handle_t *output,

                                        audio_session_t session,

                                        audio_stream_type_t *stream,

                                        pid_t pid,

                                        uid_t uid,

                                        const audio_config_t *config,

                                        audio_output_flags_t flags,
@@ -866,7 +867,7 @@ status_t AudioSystem::getOutputForAttr(const audio_attributes_t *attr, 
{

    const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();

    if (aps == 0) return NO_INIT;

    return aps->getOutputForAttr(attr, output, session, stream, uid,

    return aps->getOutputForAttr(attr, output, session, stream, pid, uid,

                                 config,

                                 flags, selectedDeviceId, portId);

}

media/libaudioclient/IAudioPolicyService.cpp

+4 −1
Original line number Diff line number Diff line
@@ -174,6 +174,7 @@ public: 
                                        audio_io_handle_t *output,

                                        audio_session_t session,

                                        audio_stream_type_t *stream,

                                        pid_t pid,

                                        uid_t uid,

                                        const audio_config_t *config,

                                        audio_output_flags_t flags,
@@ -217,6 +218,7 @@ public: 
                data.writeInt32(1);

                data.writeInt32(*stream);

            }

            data.writeInt32(pid);

            data.writeInt32(uid);

            data.write(config, sizeof(audio_config_t));

            data.writeInt32(static_cast <uint32_t>(flags));
@@ -968,6 +970,7 @@ status_t BnAudioPolicyService::onTransact( 
            if (hasStream) {

                stream = (audio_stream_type_t)data.readInt32();

            }

            pid_t pid = (pid_t)data.readInt32();

            uid_t uid = (uid_t)data.readInt32();

            audio_config_t config;

            memset(&config, 0, sizeof(audio_config_t));
@@ -978,7 +981,7 @@ status_t BnAudioPolicyService::onTransact( 
            audio_port_handle_t portId = (audio_port_handle_t)data.readInt32();

            audio_io_handle_t output = 0;

            status_t status = getOutputForAttr(hasAttributes ? &attr : NULL,

                    &output, session, &stream, uid,

                    &output, session, &stream, pid, uid,

                    &config,

                    flags, &selectedDeviceId, &portId);

            reply->writeInt32(status);

media/libaudioclient/include/media/AudioSystem.h

+1 −0
Original line number Diff line number Diff line
@@ -216,6 +216,7 @@ public: 
                                     audio_io_handle_t *output,

                                     audio_session_t session,

                                     audio_stream_type_t *stream,

                                     pid_t pid,

                                     uid_t uid,

                                     const audio_config_t *config,

                                     audio_output_flags_t flags,

media/libaudioclient/include/media/IAudioPolicyService.h

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ public: 
                                      audio_io_handle_t *output,

                                      audio_session_t session,

                                      audio_stream_type_t *stream,

                                      pid_t pid,

                                      uid_t uid,

                                      const audio_config_t *config,

                                      audio_output_flags_t flags,

media/libmedia/TypeConverter.cpp

+3 −0
Original line number Diff line number Diff line
@@ -115,6 +115,9 @@ const OutputFlagConverter::Table OutputFlagConverter::mTable[] = { 
    MAKE_STRING_FROM_ENUM(AUDIO_OUTPUT_FLAG_DIRECT_PCM),

    MAKE_STRING_FROM_ENUM(AUDIO_OUTPUT_FLAG_MMAP_NOIRQ),

    MAKE_STRING_FROM_ENUM(AUDIO_OUTPUT_FLAG_VOIP_RX),

    // FIXME: this cast will be removed when the flag will be

    // declared in types.hal for audio HAL V4.0 and auto imported to audio-base.h

    MAKE_STRING_FROM_ENUM((audio_output_flags_t)AUDIO_OUTPUT_FLAG_INCALL_MUSIC),

    TERMINATOR

};