diff options
| author | Robert Shih <robertshih@google.com> | 2015-09-03 17:52:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-03 17:52:44 +0000 |
| commit | c1e989e76a461ea69e293839b3c29b634a462bd5 (patch) | |
| tree | f2285a73a3ae481533a578215ae6c6cef2c63fe1 /media/libmedia | |
| parent | 3732a3acafa7eb621bc26cca3eb00150ea12d2e2 (diff) | |
| parent | 13ff64c2db84f4e7cac3396700e333b48c42c7ee (diff) | |
| download | frameworks_av-c1e989e76a461ea69e293839b3c29b634a462bd5.zip frameworks_av-c1e989e76a461ea69e293839b3c29b634a462bd5.tar.gz frameworks_av-c1e989e76a461ea69e293839b3c29b634a462bd5.tar.bz2 | |
am 13ff64c2: Merge "Zero out return values in media binder calls" into klp-dev
* commit '13ff64c2db84f4e7cac3396700e333b48c42c7ee':
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 9ffc486..0dab7e3 100644 --- a/media/libmedia/IAudioPolicyService.cpp +++ b/media/libmedia/IAudioPolicyService.cpp @@ -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)); diff --git a/media/libmedia/IMediaPlayer.cpp b/media/libmedia/IMediaPlayer.cpp index 9b57902..2a5c7a7 100644 --- a/media/libmedia/IMediaPlayer.cpp +++ b/media/libmedia/IMediaPlayer.cpp @@ -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); |