commit 13ff64c2db84f4e7cac3396700e333b48c42c7ee
author Robert Shih <robertshih@google.com> Thu Sep 03 17:21:20 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 03 17:21:20 2015 +0000
tree 626467528e2ff75d1d312d6879988b5ec25eaab9
parent ab20313074bb109f29f677c3f09d5da1a48c94e7
parent 892354335d49f0b9fcd10e20e0c13e3cd0f1f1cb

Merge "Zero out return values in media binder calls" into klp-dev

media/libmedia/IAudioPolicyService.cpp

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 @@
             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));

media/libmedia/IMediaPlayer.cpp

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 @@
         } 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 @@
         } 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);