summaryrefslogtreecommitdiffstats
path: root/media/libmedia
diff options
context:
space:
mode:
authorRobert Shih <robertshih@google.com>2015-09-03 17:46:04 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-03 17:46:04 +0000
commit4abb48c30cd7821f3397ccd7de8deb3eb645b385 (patch)
tree7b510ebbcd7328acdce8b9fa30be26cd60fdda12 /media/libmedia
parentac774d53fff5a580b9fe41ac4a7c6bb96b5137ef (diff)
parent898e857594b738f88be4de5addc8ca296dfabd74 (diff)
downloadframeworks_av-4abb48c30cd7821f3397ccd7de8deb3eb645b385.zip
frameworks_av-4abb48c30cd7821f3397ccd7de8deb3eb645b385.tar.gz
frameworks_av-4abb48c30cd7821f3397ccd7de8deb3eb645b385.tar.bz2
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
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 cfb28a9..ef52eb5 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,