Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc5d0f46 authored by Pablo Ceballos's avatar Pablo Ceballos Committed by android-build-merger
Browse files

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

am: b4eac742

* commit 'b4eac742':
  DO NOT MERGE BQ: fix some uninitialized variables
parents ec7538a2 b4eac742

libs/gui/IGraphicBufferConsumer.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -410,7 +410,7 @@ status_t BnGraphicBufferConsumer::onTransact( 
        } break;

        } break;

        case GET_RELEASED_BUFFERS: {

        case GET_RELEASED_BUFFERS: {

            CHECK_INTERFACE(IGraphicBufferConsumer, data, reply);

            CHECK_INTERFACE(IGraphicBufferConsumer, data, reply);

            uint32_t slotMask;

            uint32_t slotMask = 0;

            status_t result = getReleasedBuffers(&slotMask);

            status_t result = getReleasedBuffers(&slotMask);

            reply->writeInt32(slotMask);

            reply->writeInt32(slotMask);

            reply->writeInt32(result);

            reply->writeInt32(result);

libs/gui/IGraphicBufferProducer.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -253,6 +253,7 @@ status_t BnGraphicBufferProducer::onTransact( 
            QueueBufferOutput* const output =

            QueueBufferOutput* const output =

                    reinterpret_cast<QueueBufferOutput *>(

                    reinterpret_cast<QueueBufferOutput *>(

                            reply->writeInplace(sizeof(QueueBufferOutput)));

                            reply->writeInplace(sizeof(QueueBufferOutput)));

            memset(output, 0, sizeof(QueueBufferOutput));

            status_t res = connect(token, api, producerControlledByApp, output);

            status_t res = connect(token, api, producerControlledByApp, output);

            reply->writeInt32(res);

            reply->writeInt32(res);

            return NO_ERROR;

            return NO_ERROR;