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

Commit d6c480ef authored by John Reck's avatar John Reck Committed by android-build-merger
Browse files

Merge "Don\'t flatten nullptrs" into nyc-dev 

am: 55e5cc0e

* commit '55e5cc0e':
  Don't flatten nullptrs

Change-Id: Ib4c2d067ec151904048cfb4a54b36d0398d1a670
parents 07c41bfc 55e5cc0e

libs/gui/IGraphicBufferProducer.cpp

+12 −3
Original line number Diff line number Diff line
@@ -395,8 +395,12 @@ public: 
        if (result != NO_ERROR) {

            return result;

        }

        sp<GraphicBuffer> buffer(new GraphicBuffer);

        bool hasBuffer = reply.readBool();

        sp<GraphicBuffer> buffer;

        if (hasBuffer) {

            buffer = new GraphicBuffer();

            result = reply.read(*buffer);

        }

        if (result != NO_ERROR) {

            ALOGE("getLastQueuedBuffer failed to read buffer: %d", result);

            return result;
@@ -631,7 +635,12 @@ status_t BnGraphicBufferProducer::onTransact( 
            if (result != NO_ERROR) {

                return result;

            }

            if (!buffer.get()) {

                reply->writeBool(false);

            } else {

                reply->writeBool(true);

                result = reply->write(*buffer);

            }

            if (result != NO_ERROR) {

                ALOGE("getLastQueuedBuffer failed to write buffer: %d", result);

                return result;