diff options
author | Robert Shih <robertshih@google.com> | 2015-09-04 17:55:48 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-04 17:55:48 +0000 |
commit | 35e03636d6fa0c7c33c67e10686657849a61aff8 (patch) | |
tree | 5a047213b1a7e042096bf0b1c0f32025d82a26ed /media/libmedia/IMediaPlayer.cpp | |
parent | 7ecf636997b812ff5ae87ea9e146707d37d1b78a (diff) | |
parent | becceb1136e7eb01db7dd865cb98a57117212879 (diff) | |
download | frameworks_av-35e03636d6fa0c7c33c67e10686657849a61aff8.zip frameworks_av-35e03636d6fa0c7c33c67e10686657849a61aff8.tar.gz frameworks_av-35e03636d6fa0c7c33c67e10686657849a61aff8.tar.bz2 |
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 'becceb1136e7eb01db7dd865cb98a57117212879':
Zero out return values in media binder calls
Diffstat (limited to 'media/libmedia/IMediaPlayer.cpp')
-rw-r--r-- | media/libmedia/IMediaPlayer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libmedia/IMediaPlayer.cpp b/media/libmedia/IMediaPlayer.cpp index 7387a79..942aec3 100644 --- a/media/libmedia/IMediaPlayer.cpp +++ b/media/libmedia/IMediaPlayer.cpp @@ -566,7 +566,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); @@ -574,7 +574,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); |