summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Pablo Ceballos <pceballos@google.com> 2016-03-18 20:28:43 +0000
committer android-build-merger <android-build-merger@google.com> 2016-03-18 20:28:43 +0000
commitf16b85752d7344814663c658175cce1a933e976b (patch)
treedbfd89d47aa3afa5432f8c0339a7fc3d36785291
parent828f6f1489f546da0ebccd929dd3b819f9d45efd (diff)
parent93c617fd2a5e7910e0ba5c0ed6da152d30920679 (diff)
BQ: fix some uninitialized variables
am: 93c617f * commit '93c617fd2a5e7910e0ba5c0ed6da152d30920679': BQ: fix some uninitialized variables
-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 dc917a8b66..590a25e4cc 100644
--- a/libs/gui/IGraphicBufferConsumer.cpp
+++ b/libs/gui/IGraphicBufferConsumer.cpp
@@ -478,7 +478,7 @@ status_t BnGraphicBufferConsumer::onTransact(
} break;
case GET_RELEASED_BUFFERS: {
CHECK_INTERFACE(IGraphicBufferConsumer, data, reply);
- uint64_t slotMask;
+ uint64_t slotMask = 0;
status_t result = getReleasedBuffers(&slotMask);
reply->writeInt64(slotMask);
reply->writeInt32(result);
diff --git a/libs/gui/IGraphicBufferProducer.cpp b/libs/gui/IGraphicBufferProducer.cpp
index 67690b70dc..b5ec604a96 100644
--- a/libs/gui/IGraphicBufferProducer.cpp
+++ b/libs/gui/IGraphicBufferProducer.cpp
@@ -390,6 +390,7 @@ status_t BnGraphicBufferProducer::onTransact(
QueueBufferOutput* const output =
reinterpret_cast<QueueBufferOutput *>(
reply->writeInplace(sizeof(QueueBufferOutput)));
+ memset(output, 0, sizeof(QueueBufferOutput));
status_t res = connect(listener, api, producerControlledByApp, output);
reply->writeInt32(res);
return NO_ERROR;