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

Commit efd11d3c authored by Jessica Wagantall's avatar Jessica Wagantall
Browse files

Merge tag 'android-6.0.1_r17' into HEAD 

Android 6.0.1 release 17
Ticket: CYNGNOS-1854
parents 9e375198 daca8c34

libs/gui/IGraphicBufferConsumer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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);

libs/gui/IGraphicBufferProducer.cpp

+1 −0
Original line number Diff line number Diff line
@@ -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;