summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2015-09-09 09:48:34 -0700
committerWei Jia <wjia@google.com>2015-09-10 10:03:56 -0700
commit5f2a76f02f6d88825f8c164b4d9f7f310583eee1 (patch)
treeac667c1fa7c2f9a60bf01fc67154b9fcd874ca74 /media
parent69ae6a87342d5260d8d8660accc8aa1b9367dbbe (diff)
downloadframeworks_av-5f2a76f02f6d88825f8c164b4d9f7f310583eee1.zip
frameworks_av-5f2a76f02f6d88825f8c164b4d9f7f310583eee1.tar.gz
frameworks_av-5f2a76f02f6d88825f8c164b4d9f7f310583eee1.tar.bz2
DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.
Bug: 23905951 Bug: 23912202 Change-Id: Id13a9d3cae2c09e7381b841e67ddfb188274d74c (cherry picked from commit e995e477ad59b79145200c8f1e9e13c16c682d59)
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();