commit 4abb48c30cd7821f3397ccd7de8deb3eb645b385
author Robert Shih <robertshih@google.com> Thu Sep 03 17:46:04 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 03 17:46:04 2015 +0000
tree 7b510ebbcd7328acdce8b9fa30be26cd60fdda12
parent ac774d53fff5a580b9fe41ac4a7c6bb96b5137ef
parent 898e857594b738f88be4de5addc8ca296dfabd74

am 898e8575: am 72b0abdf: Merge "Zero out return values in audio binder calls" into lmp-mr1-dev

* commit '898e857594b738f88be4de5addc8ca296dfabd74':
  Zero out return values in audio binder calls

media/libmedia/IAudioPolicyService.cpp

diff --git a/media/libmedia/IAudioPolicyService.cpp b/media/libmedia/IAudioPolicyService.cpp
index cfb28a9..ef52eb5 100644
--- a/media/libmedia/IAudioPolicyService.cpp
+++ b/media/libmedia/IAudioPolicyService.cpp
@@ -816,7 +816,7 @@
             if (hasOffloadInfo) {
                 data.read(&offloadInfo, sizeof(audio_offload_info_t));
             }
-            audio_io_handle_t output;
+            audio_io_handle_t output = 0;
             status_t status = getOutputForAttr(hasAttributes ? &attr : NULL,
                     &output, session, &stream,
                     samplingRate, format, channelMask,