summaryrefslogtreecommitdiffstats
path: root/libs/gui
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@cyngn.com>2016-03-07 18:12:29 -0800
committerJessica Wagantall <jwagantall@cyngn.com>2016-03-07 18:12:29 -0800
commitefd11d3c0bd9dab4f83398acab27226b73da774f (patch)
tree77281c84fd92e7737449e9211ae1228daae365dd /libs/gui
parent9e3751980f9748f77acef3fd277735667d02901f (diff)
parentdaca8c3407dcc43eeded42d49b4357ff507f27de (diff)
downloadframeworks_native-efd11d3c0bd9dab4f83398acab27226b73da774f.zip
frameworks_native-efd11d3c0bd9dab4f83398acab27226b73da774f.tar.gz
frameworks_native-efd11d3c0bd9dab4f83398acab27226b73da774f.tar.bz2
Merge tag 'android-6.0.1_r17' into HEAD
Android 6.0.1 release 17 Ticket: CYNGNOS-1854
Diffstat (limited to 'libs/gui')
-rw-r--r--libs/gui/IGraphicBufferConsumer.cpp2
-rw-r--r--libs/gui/IGraphicBufferProducer.cpp1
2 files changed, 2 insertions, 1 deletions
diff --git a/libs/gui/IGraphicBufferConsumer.cpp b/libs/gui/IGraphicBufferConsumer.cpp
index b86f4c5..c4660ba 100644
--- a/libs/gui/IGraphicBufferConsumer.cpp
+++ b/libs/gui/IGraphicBufferConsumer.cpp
@@ -315,7 +315,7 @@ status_t BnGraphicBufferConsumer::onTransact(
CHECK_INTERFACE(IGraphicBufferConsumer, data, reply);
sp<GraphicBuffer> buffer = new GraphicBuffer();
data.read(*buffer.get());
- int slot;
+ int slot = -1;
int result = attachBuffer(&slot, buffer);
reply->writeInt32(slot);
reply->writeInt32(result);
diff --git a/libs/gui/IGraphicBufferProducer.cpp b/libs/gui/IGraphicBufferProducer.cpp
index 8bdbc22..1099c84 100644
--- a/libs/gui/IGraphicBufferProducer.cpp
+++ b/libs/gui/IGraphicBufferProducer.cpp
@@ -402,6 +402,7 @@ status_t BnGraphicBufferProducer::onTransact(
QueueBufferOutput* const output =
reinterpret_cast<QueueBufferOutput *>(
reply->writeInplace(sizeof(QueueBufferOutput)));
+ memset(output, 0, sizeof(QueueBufferOutput));
status_t result = queueBuffer(buf, input, output);
reply->writeInt32(result);
return NO_ERROR;