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

Commit bc0daa97 authored by Wei Jia's avatar Wei Jia Committed by Android (Google) Code Review
Browse files

Merge "IAudioFlinger: always initialize variables to ensure no info leak when... 

Merge "IAudioFlinger: always initialize variables to ensure no info leak when writing them to Parcel." into mnc-dev
parents 076d7ecf 983dca39

media/libmedia/IAudioFlinger.cpp

+11 −11
Original line number Diff line number Diff line
@@ -937,7 +937,7 @@ status_t BnAudioFlinger::onTransact( 
            pid_t tid = (pid_t) data.readInt32();

            int sessionId = data.readInt32();

            int clientUid = data.readInt32();

            status_t status;

            status_t status = NO_ERROR;

            sp<IAudioTrack> track;

            if ((haveSharedBuffer && (buffer == 0)) ||

                    ((buffer != 0) && (buffer->pointer() == NULL))) {
@@ -972,7 +972,7 @@ status_t BnAudioFlinger::onTransact( 
            size_t notificationFrames = data.readInt64();

            sp<IMemory> cblk;

            sp<IMemory> buffers;

            status_t status;

            status_t status = NO_ERROR;

            sp<IAudioRecord> record = openRecord(input,

                    sampleRate, format, channelMask, opPackageName, &frameCount, &flags, tid,

                    clientUid, &sessionId, &notificationFrames, cblk, buffers, &status);
@@ -1111,7 +1111,7 @@ status_t BnAudioFlinger::onTransact( 
            audio_devices_t devices = (audio_devices_t)data.readInt32();

            String8 address(data.readString8());

            audio_output_flags_t flags = (audio_output_flags_t) data.readInt32();

            uint32_t latencyMs;

            uint32_t latencyMs = 0;

            audio_io_handle_t output;

            status_t status = openOutput(module, &output, &config,

                                         &devices, address, &latencyMs, flags);
@@ -1190,8 +1190,8 @@ status_t BnAudioFlinger::onTransact( 
        case GET_RENDER_POSITION: {

            CHECK_INTERFACE(IAudioFlinger, data, reply);

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

            uint32_t halFrames;

            uint32_t dspFrames;

            uint32_t halFrames = 0;

            uint32_t dspFrames = 0;

            status_t status = getRenderPosition(&halFrames, &dspFrames, output);

            reply->writeInt32(status);

            if (status == NO_ERROR) {
@@ -1227,7 +1227,7 @@ status_t BnAudioFlinger::onTransact( 
        } break;

        case QUERY_NUM_EFFECTS: {

            CHECK_INTERFACE(IAudioFlinger, data, reply);

            uint32_t numEffects;

            uint32_t numEffects = 0;

            status_t status = queryNumberEffects(&numEffects);

            reply->writeInt32(status);

            if (status == NO_ERROR) {
@@ -1237,7 +1237,7 @@ status_t BnAudioFlinger::onTransact( 
        }

        case QUERY_EFFECT: {

            CHECK_INTERFACE(IAudioFlinger, data, reply);

            effect_descriptor_t desc;

            effect_descriptor_t desc = {};

            status_t status = queryEffect(data.readInt32(), &desc);

            reply->writeInt32(status);

            if (status == NO_ERROR) {
@@ -1249,7 +1249,7 @@ status_t BnAudioFlinger::onTransact( 
            CHECK_INTERFACE(IAudioFlinger, data, reply);

            effect_uuid_t uuid;

            data.read(&uuid, sizeof(effect_uuid_t));

            effect_descriptor_t desc;

            effect_descriptor_t desc = {};

            status_t status = getEffectDescriptor(&uuid, &desc);

            reply->writeInt32(status);

            if (status == NO_ERROR) {
@@ -1268,9 +1268,9 @@ status_t BnAudioFlinger::onTransact( 
            audio_io_handle_t output = (audio_io_handle_t) data.readInt32();

            int sessionId = data.readInt32();

            const String16 opPackageName = data.readString16();

            status_t status;

            int id;

            int enabled;

            status_t status = NO_ERROR;

            int id = 0;

            int enabled = 0;



            sp<IEffect> effect = createEffect(&desc, client, priority, output, sessionId,

                    opPackageName, &status, &id, &enabled);

media/libmedia/IAudioPolicyService.cpp

+4 −4
Original line number Diff line number Diff line
@@ -932,7 +932,7 @@ status_t BnAudioPolicyService::onTransact( 
            audio_channel_mask_t channelMask = data.readInt32();

            audio_input_flags_t flags = (audio_input_flags_t) data.readInt32();

            audio_port_handle_t selectedDeviceId = (audio_port_handle_t) data.readInt32();

            audio_io_handle_t input;

            audio_io_handle_t input = {};

            status_t status = getInputForAttr(&attr, &input, session, uid,

                                              samplingRate, format, channelMask,

                                              flags, selectedDeviceId);
@@ -1242,9 +1242,9 @@ status_t BnAudioPolicyService::onTransact( 
            CHECK_INTERFACE(IAudioPolicyService, data, reply);

            sp<IAudioPolicyServiceClient> client = interface_cast<IAudioPolicyServiceClient>(

                    data.readStrongBinder());

            audio_session_t session;

            audio_io_handle_t ioHandle;

            audio_devices_t device;

            audio_session_t session = {};

            audio_io_handle_t ioHandle = {};

            audio_devices_t device = {};

            status_t status = acquireSoundTriggerSession(&session, &ioHandle, &device);

            reply->writeInt32(status);

            if (status == NO_ERROR) {