diff options
author | Robert Shih <robertshih@google.com> | 2015-09-03 18:04:17 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-03 18:04:17 +0000 |
commit | 3ca51aa9c8eb670b3b93ab37350fa4e0a0397bd6 (patch) | |
tree | d3b5834f818114082f29989a057b78db8fe83ea3 /media | |
parent | b553ce1489d217ed2d1484d940832333a97c584d (diff) | |
parent | e6eeff25562cecb668110b446d6114098e27370d (diff) | |
download | frameworks_av-3ca51aa9c8eb670b3b93ab37350fa4e0a0397bd6.zip frameworks_av-3ca51aa9c8eb670b3b93ab37350fa4e0a0397bd6.tar.gz frameworks_av-3ca51aa9c8eb670b3b93ab37350fa4e0a0397bd6.tar.bz2 |
am e6eeff25: am 4abb48c3: am 898e8575: am 72b0abdf: Merge "Zero out return values in audio binder calls" into lmp-mr1-dev
* commit 'e6eeff25562cecb668110b446d6114098e27370d':
Zero out return values in audio binder calls
Diffstat (limited to 'media')
-rw-r--r-- | media/libmedia/IAudioPolicyService.cpp | 2 |
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, |