diff options
| author | Robert Shih <robertshih@google.com> | 2015-09-04 17:49:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-04 17:49:32 +0000 |
| commit | becceb1136e7eb01db7dd865cb98a57117212879 (patch) | |
| tree | e730eca78b87442a236f78b962666e32e8875673 /media/libmedia | |
| parent | 7734e37efe4ad47d91cdc5cfa6703d77a7a2ac0c (diff) | |
| parent | b57ffbb5486a58e0dbb03466e9f3a5e51d6cf0f3 (diff) | |
| download | frameworks_av-becceb1136e7eb01db7dd865cb98a57117212879.zip frameworks_av-becceb1136e7eb01db7dd865cb98a57117212879.tar.gz frameworks_av-becceb1136e7eb01db7dd865cb98a57117212879.tar.bz2 | |
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 'b57ffbb5486a58e0dbb03466e9f3a5e51d6cf0f3':
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 ef52eb5..8790fcb 100644 --- a/media/libmedia/IAudioPolicyService.cpp +++ b/media/libmedia/IAudioPolicyService.cpp @@ -931,7 +931,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 fb26b87..c1b9025 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); |