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

Commit 13ff64c2 authored by Robert Shih's avatar Robert Shih Committed by Android (Google) Code Review
Browse files

Merge "Zero out return values in media binder calls" into klp-dev

parents ab203130 89235433

media/libmedia/IAudioPolicyService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -567,7 +567,7 @@ status_t BnAudioPolicyService::onTransact( 
            audio_stream_type_t stream =

                    static_cast <audio_stream_type_t>(data.readInt32());

            audio_devices_t device = static_cast <audio_devices_t>(data.readInt32());

            int index;

            int index = 0;

            status_t status = getStreamVolumeIndex(stream, &index, device);

            reply->writeInt32(index);

            reply->writeInt32(static_cast <uint32_t>(status));

media/libmedia/IMediaPlayer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -423,7 +423,7 @@ status_t BnMediaPlayer::onTransact( 
        } break;

        case GET_CURRENT_POSITION: {

            CHECK_INTERFACE(IMediaPlayer, data, reply);

            int msec;

            int msec = 0;

            status_t ret = getCurrentPosition(&msec);

            reply->writeInt32(msec);

            reply->writeInt32(ret);
@@ -431,7 +431,7 @@ status_t BnMediaPlayer::onTransact( 
        } break;

        case GET_DURATION: {

            CHECK_INTERFACE(IMediaPlayer, data, reply);

            int msec;

            int msec = 0;

            status_t ret = getDuration(&msec);

            reply->writeInt32(msec);

            reply->writeInt32(ret);