summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2015-09-11 14:10:14 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-11 14:10:14 +0000
commit8cfd0ac4b05f3151f1083564f46f05b5f525af8a (patch)
tree67fbf7b742b123d857ce7ff3444018a1af3f21ac /media
parent44da08ed957157645e1c8776bb59924b1bb7f61c (diff)
parent741a335126a562ae8f5883cc0b02ba72f40e56f3 (diff)
downloadframeworks_av-8cfd0ac4b05f3151f1083564f46f05b5f525af8a.zip
frameworks_av-8cfd0ac4b05f3151f1083564f46f05b5f525af8a.tar.gz
frameworks_av-8cfd0ac4b05f3151f1083564f46f05b5f525af8a.tar.bz2
am 741a3351: Merge "DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel." into klp-dev
* commit '741a335126a562ae8f5883cc0b02ba72f40e56f3': DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.
Diffstat (limited to 'media')
-rw-r--r--media/libmedia/IAudioFlinger.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/media/libmedia/IAudioFlinger.cpp b/media/libmedia/IAudioFlinger.cpp
index acfaea0..adc7186 100644
--- a/media/libmedia/IAudioFlinger.cpp
+++ b/media/libmedia/IAudioFlinger.cpp
@@ -1080,8 +1080,10 @@ status_t BnAudioFlinger::onTransact(
}
case CREATE_EFFECT: {
CHECK_INTERFACE(IAudioFlinger, data, reply);
- effect_descriptor_t desc;
- data.read(&desc, sizeof(effect_descriptor_t));
+ effect_descriptor_t desc = {};
+ if (data.read(&desc, sizeof(effect_descriptor_t)) != NO_ERROR) {
+ ALOGE("b/23905951");
+ }
sp<IEffectClient> client = interface_cast<IEffectClient>(data.readStrongBinder());
int32_t priority = data.readInt32();
audio_io_handle_t output = (audio_io_handle_t) data.readInt32();