commit dc5d0f46de1f8a800b3af340ca57278989df151a
author Pablo Ceballos <pceballos@google.com> Fri Mar 18 18:01:32 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 18 18:01:32 2016 +0000
tree 0978998e1519547d90809ec6b1d069dee9ecf9e2
parent ec7538a254f283afc7b046aa8ca2fe908d4e3b0c
parent b4eac742c9e3f0238d5d03b237b2038df885ed2c

Merge "DO NOT MERGE BQ: fix some uninitialized variables" into klp-dev
am: b4eac74

* commit 'b4eac742c9e3f0238d5d03b237b2038df885ed2c':
  DO NOT MERGE BQ: fix some uninitialized variables

libs/gui/IGraphicBufferConsumer.cpp

diff --git a/libs/gui/IGraphicBufferConsumer.cpp b/libs/gui/IGraphicBufferConsumer.cpp
index 9574b61..ea98296 100644
--- a/libs/gui/IGraphicBufferConsumer.cpp
+++ b/libs/gui/IGraphicBufferConsumer.cpp
@@ -410,7 +410,7 @@
         } break;
         case GET_RELEASED_BUFFERS: {
             CHECK_INTERFACE(IGraphicBufferConsumer, data, reply);
-            uint32_t slotMask;
+            uint32_t slotMask = 0;
             status_t result = getReleasedBuffers(&slotMask);
             reply->writeInt32(slotMask);
             reply->writeInt32(result);

libs/gui/IGraphicBufferProducer.cpp

diff --git a/libs/gui/IGraphicBufferProducer.cpp b/libs/gui/IGraphicBufferProducer.cpp
index 3171b65..a67e828 100644
--- a/libs/gui/IGraphicBufferProducer.cpp
+++ b/libs/gui/IGraphicBufferProducer.cpp
@@ -253,6 +253,7 @@
             QueueBufferOutput* const output =
                     reinterpret_cast<QueueBufferOutput *>(
                             reply->writeInplace(sizeof(QueueBufferOutput)));
+            memset(output, 0, sizeof(QueueBufferOutput));
             status_t res = connect(token, api, producerControlledByApp, output);
             reply->writeInt32(res);
             return NO_ERROR;