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

Commit 35e03636 authored by Robert Shih's avatar Robert Shih Committed by Android Git Automerger
Browse files

am becceb11: am b57ffbb5: am d021f7e5: am b18c0276: am 2b63b91b: am c1e989e7:... 

am becceb11: am b57ffbb5: am d021f7e5: am b18c0276: am 2b63b91b: am c1e989e7: am 13ff64c2: Merge "Zero out return values in media binder calls" into klp-dev

* commit 'becceb11':
  Zero out return values in media binder calls
parents 7ecf6369 becceb11

media/libmedia/IAudioPolicyService.cpp

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

            audio_stream_type_t stream =

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

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

            audio_devices_t device = static_cast <audio_devices_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);

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

            reply->writeInt32(index);

            reply->writeInt32(index);

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

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

media/libmedia/IMediaPlayer.cpp

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

        } break;

        case GET_CURRENT_POSITION: {

        case GET_CURRENT_POSITION: {

            CHECK_INTERFACE(IMediaPlayer, data, reply);

            CHECK_INTERFACE(IMediaPlayer, data, reply);

            int msec;

            int msec = 0;

            status_t ret = getCurrentPosition(&msec);

            status_t ret = getCurrentPosition(&msec);

            reply->writeInt32(msec);

            reply->writeInt32(msec);

            reply->writeInt32(ret);

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

        } break;

        case GET_DURATION: {

        case GET_DURATION: {

            CHECK_INTERFACE(IMediaPlayer, data, reply);

            CHECK_INTERFACE(IMediaPlayer, data, reply);

            int msec;

            int msec = 0;

            status_t ret = getDuration(&msec);

            status_t ret = getDuration(&msec);

            reply->writeInt32(msec);

            reply->writeInt32(msec);

            reply->writeInt32(ret);

            reply->writeInt32(ret);