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

Commit bf2e61f5 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Use audio_patch_handle_t in startAudioSource() and stopAudioSource()"

parents 1e4d737f 559d439c

include/media/AudioSystem.h

+2 −2
Original line number Diff line number Diff line
@@ -330,8 +330,8 @@ public: 


    static status_t startAudioSource(const struct audio_port_config *source,

                                      const audio_attributes_t *attributes,

                                      audio_io_handle_t *handle);

    static status_t stopAudioSource(audio_io_handle_t handle);

                                      audio_patch_handle_t *handle);

    static status_t stopAudioSource(audio_patch_handle_t handle);



    static status_t setMasterMono(bool mono);

    static status_t getMasterMono(bool *mono);

include/media/IAudioPolicyService.h

+2 −2
Original line number Diff line number Diff line
@@ -164,8 +164,8 @@ public: 


    virtual status_t startAudioSource(const struct audio_port_config *source,

                                      const audio_attributes_t *attributes,

                                      audio_io_handle_t *handle) = 0;

    virtual status_t stopAudioSource(audio_io_handle_t handle) = 0;

                                      audio_patch_handle_t *handle) = 0;

    virtual status_t stopAudioSource(audio_patch_handle_t handle) = 0;



    virtual status_t setMasterMono(bool mono) = 0;

    virtual status_t getMasterMono(bool *mono) = 0;

media/libmedia/AudioSystem.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1175,14 +1175,14 @@ status_t AudioSystem::registerPolicyMixes(const Vector<AudioMix>& mixes, bool re 


status_t AudioSystem::startAudioSource(const struct audio_port_config *source,

                                       const audio_attributes_t *attributes,

                                       audio_io_handle_t *handle)

                                       audio_patch_handle_t *handle)

{

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

    if (aps == 0) return PERMISSION_DENIED;

    return aps->startAudioSource(source, attributes, handle);

}



status_t AudioSystem::stopAudioSource(audio_io_handle_t handle)

status_t AudioSystem::stopAudioSource(audio_patch_handle_t handle)

{

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

    if (aps == 0) return PERMISSION_DENIED;

media/libmedia/IAudioPolicyService.cpp

+5 −5
Original line number Diff line number Diff line
@@ -738,7 +738,7 @@ public: 


    virtual status_t startAudioSource(const struct audio_port_config *source,

                                      const audio_attributes_t *attributes,

                                      audio_io_handle_t *handle)

                                      audio_patch_handle_t *handle)

    {

        Parcel data, reply;

        data.writeInterfaceToken(IAudioPolicyService::getInterfaceDescriptor());
@@ -755,11 +755,11 @@ public: 
        if (status != NO_ERROR) {

            return status;

        }

        *handle = (audio_io_handle_t)reply.readInt32();

        *handle = (audio_patch_handle_t)reply.readInt32();

        return status;

    }



    virtual status_t stopAudioSource(audio_io_handle_t handle)

    virtual status_t stopAudioSource(audio_patch_handle_t handle)

    {

        Parcel data, reply;

        data.writeInterfaceToken(IAudioPolicyService::getInterfaceDescriptor());
@@ -1332,7 +1332,7 @@ status_t BnAudioPolicyService::onTransact( 
            data.read(&source, sizeof(struct audio_port_config));

            audio_attributes_t attributes;

            data.read(&attributes, sizeof(audio_attributes_t));

            audio_io_handle_t handle = {};

            audio_patch_handle_t handle = AUDIO_PATCH_HANDLE_NONE;

            status_t status = startAudioSource(&source, &attributes, &handle);

            reply->writeInt32(status);

            reply->writeInt32(handle);
@@ -1341,7 +1341,7 @@ status_t BnAudioPolicyService::onTransact( 


        case STOP_AUDIO_SOURCE: {

            CHECK_INTERFACE(IAudioPolicyService, data, reply);

            audio_io_handle_t handle = (audio_io_handle_t)data.readInt32();

            audio_patch_handle_t handle = (audio_patch_handle_t) data.readInt32();

            status_t status = stopAudioSource(handle);

            reply->writeInt32(status);

            return NO_ERROR;

services/audiopolicy/AudioPolicyInterface.h

+2 −2
Original line number Diff line number Diff line
@@ -234,9 +234,9 @@ public: 


    virtual status_t startAudioSource(const struct audio_port_config *source,

                                      const audio_attributes_t *attributes,

                                      audio_io_handle_t *handle,

                                      audio_patch_handle_t *handle,

                                      uid_t uid) = 0;

    virtual status_t stopAudioSource(audio_io_handle_t handle) = 0;

    virtual status_t stopAudioSource(audio_patch_handle_t handle) = 0;



    virtual status_t setMasterMono(bool mono) = 0;

    virtual status_t getMasterMono(bool *mono) = 0;