summaryrefslogtreecommitdiffstats
path: root/media/libmedia/IMediaPlayer.cpp
diff options
context:
space:
mode:
authorRobert Shih <robertshih@google.com>2015-09-03 18:05:44 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-03 18:05:44 +0000
commit2b63b91b84c75afdef4213aa11b0dcc8e7d735a3 (patch)
tree472d338d65970f75ed5df6cddc4664e9e2a42d34 /media/libmedia/IMediaPlayer.cpp
parent52a4fc09b483a20ee7d5970be01598ee262f7088 (diff)
parentc1e989e76a461ea69e293839b3c29b634a462bd5 (diff)
downloadframeworks_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/IMediaPlayer.cpp')
-rw-r--r--media/libmedia/IMediaPlayer.cpp4
1 files changed, 2 insertions, 2 deletions
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);