diff options
| author | Robert Shih <robertshih@google.com> | 2015-09-03 18:05:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-03 18:05:44 +0000 |
| commit | 2b63b91b84c75afdef4213aa11b0dcc8e7d735a3 (patch) | |
| tree | 472d338d65970f75ed5df6cddc4664e9e2a42d34 /media/libmedia | |
| parent | 52a4fc09b483a20ee7d5970be01598ee262f7088 (diff) | |
| parent | c1e989e76a461ea69e293839b3c29b634a462bd5 (diff) | |
| download | frameworks_av-2b63b91b84c75afdef4213aa11b0dcc8e7d735a3.zip frameworks_av-2b63b91b84c75afdef4213aa11b0dcc8e7d735a3.tar.gz frameworks_av-2b63b91b84c75afdef4213aa11b0dcc8e7d735a3.tar.bz2 | |
am c1e989e7: am 13ff64c2: Merge "Zero out return values in media binder calls" into klp-dev
* commit 'c1e989e76a461ea69e293839b3c29b634a462bd5':
Zero out return values in media binder calls
Diffstat (limited to 'media/libmedia')
| -rw-r--r-- | media/libmedia/IAudioPolicyService.cpp | 2 | ||||
| -rw-r--r-- | media/libmedia/IMediaPlayer.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/media/libmedia/IAudioPolicyService.cpp b/media/libmedia/IAudioPolicyService.cpp index fc4a787..4e47c79 100644 --- a/media/libmedia/IAudioPolicyService.cpp +++ b/media/libmedia/IAudioPolicyService.cpp @@ -829,7 +829,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)); diff --git a/media/libmedia/IMediaPlayer.cpp b/media/libmedia/IMediaPlayer.cpp index aa22b58..a29a7de 100644 --- a/media/libmedia/IMediaPlayer.cpp +++ b/media/libmedia/IMediaPlayer.cpp @@ -438,7 +438,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); @@ -446,7 +446,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); |