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

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

Merge tag 'android-5.1.1_r35' into HEAD 

Android 5.1.1 release 35
Ticket: CYNGNOS-1854
parents cc4d297b b8a86fe8

libs/gui/IGraphicBufferConsumer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -444,7 +444,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
@@ -375,6 +375,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;