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

Commit 448417ae authored by Glenn Kasten's avatar Glenn Kasten Committed by Android Git Automerger
Browse files

am d11895bc: am 62fe78b6: Merge "Fix memory leak" into lmp-mr1-dev 

* commit 'd11895bc':
  Fix memory leak
parents b7ea09ab d11895bc

media/libmedia/IAudioPolicyService.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -705,8 +705,8 @@ status_t BnAudioPolicyService::onTransact( 




        case GET_OUTPUT_FOR_ATTR: {

        case GET_OUTPUT_FOR_ATTR: {

            CHECK_INTERFACE(IAudioPolicyService, data, reply);

            CHECK_INTERFACE(IAudioPolicyService, data, reply);

            audio_attributes_t *attr = (audio_attributes_t *) calloc(1, sizeof(audio_attributes_t));

            audio_attributes_t attr;

            data.read(attr, sizeof(audio_attributes_t));

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

            uint32_t samplingRate = data.readInt32();

            uint32_t samplingRate = data.readInt32();

            audio_format_t format = (audio_format_t) data.readInt32();

            audio_format_t format = (audio_format_t) data.readInt32();

            audio_channel_mask_t channelMask = data.readInt32();

            audio_channel_mask_t channelMask = data.readInt32();
@@ -717,7 +717,7 @@ status_t BnAudioPolicyService::onTransact( 
            if (hasOffloadInfo) {

            if (hasOffloadInfo) {

                data.read(&offloadInfo, sizeof(audio_offload_info_t));

                data.read(&offloadInfo, sizeof(audio_offload_info_t));

            }

            }

            audio_io_handle_t output = getOutputForAttr(attr,

            audio_io_handle_t output = getOutputForAttr(&attr,

                    samplingRate,

                    samplingRate,

                    format,

                    format,

                    channelMask,

                    channelMask,