summaryrefslogtreecommitdiffstats
path: root/media/libmedia
diff options
context:
space:
mode:
authorRobert Shih <robertshih@google.com>2015-09-03 17:32:48 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-03 17:32:48 +0000
commit898e857594b738f88be4de5addc8ca296dfabd74 (patch)
tree90169314d7be6df6f7504dfab93d8b25c8491798 /media/libmedia
parenteda49b160b0d730140f0ab48cf7a4013f2d97f30 (diff)
parent72b0abdf56c655aae3052f7f762f5e6d8168a154 (diff)
downloadframeworks_av-898e857594b738f88be4de5addc8ca296dfabd74.zip
frameworks_av-898e857594b738f88be4de5addc8ca296dfabd74.tar.gz
frameworks_av-898e857594b738f88be4de5addc8ca296dfabd74.tar.bz2
am 72b0abdf: Merge "Zero out return values in audio binder calls" into lmp-mr1-dev
* commit '72b0abdf56c655aae3052f7f762f5e6d8168a154': Zero out return values in audio binder calls
Diffstat (limited to 'media/libmedia')
-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,