summaryrefslogtreecommitdiffstats
path: root/media/libmedia
diff options
context:
space:
mode:
authorRobert Shih <robertshih@google.com>2015-09-03 17:58:08 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-03 17:58:08 +0000
commite6eeff25562cecb668110b446d6114098e27370d (patch)
tree76fe806d031a362223877e0a19edef2cd02f2872 /media/libmedia
parentf9156653832ddb8ad0888004cb555bcb4ce88269 (diff)
parent4abb48c30cd7821f3397ccd7de8deb3eb645b385 (diff)
downloadframeworks_av-e6eeff25562cecb668110b446d6114098e27370d.zip
frameworks_av-e6eeff25562cecb668110b446d6114098e27370d.tar.gz
frameworks_av-e6eeff25562cecb668110b446d6114098e27370d.tar.bz2
am 4abb48c3: am 898e8575: am 72b0abdf: Merge "Zero out return values in audio binder calls" into lmp-mr1-dev
* commit '4abb48c30cd7821f3397ccd7de8deb3eb645b385': 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 3348441..06ae8c0 100644
--- a/media/libmedia/IAudioPolicyService.cpp
+++ b/media/libmedia/IAudioPolicyService.cpp
@@ -877,7 +877,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, uid,
samplingRate, format, channelMask,