summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorRobert Shih <robertshih@google.com>2015-09-03 17:21:37 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-09-03 17:21:37 +0000
commit72b0abdf56c655aae3052f7f762f5e6d8168a154 (patch)
tree90169314d7be6df6f7504dfab93d8b25c8491798 /media
parent3f79dbfcb1a62c28094b403ba954ab4543d709f7 (diff)
parenta946d844a77906072f5eb7093d41db465d6514bb (diff)
downloadframeworks_av-72b0abdf56c655aae3052f7f762f5e6d8168a154.zip
frameworks_av-72b0abdf56c655aae3052f7f762f5e6d8168a154.tar.gz
frameworks_av-72b0abdf56c655aae3052f7f762f5e6d8168a154.tar.bz2
Merge "Zero out return values in audio binder calls" into lmp-mr1-dev
Diffstat (limited to 'media')
-rw-r--r--media/libmedia/IAudioPolicyService.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmedia/IAudioPolicyService.cpp b/media/libmedia/IAudioPolicyService.cpp
index 12efa8a..d91b73b 100644
--- a/media/libmedia/IAudioPolicyService.cpp
+++ b/media/libmedia/IAudioPolicyService.cpp
@@ -816,7 +816,7 @@ status_t BnAudioPolicyService::onTransact(
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,