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

Commit 69412a51 authored by Naveen Leekha's avatar Naveen Leekha Committed by Android Git Automerger
Browse files

am c4bd7211: resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev 

* commit 'c4bd7211':
  resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev
parents 571e27e2 c4bd7211

libs/gui/IGraphicBufferProducer.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -348,7 +348,7 @@ status_t BnGraphicBufferProducer::onTransact( 
            uint32_t height = data.readUint32();

            uint32_t height = data.readUint32();

            PixelFormat format = static_cast<PixelFormat>(data.readInt32());

            PixelFormat format = static_cast<PixelFormat>(data.readInt32());

            uint32_t usage = data.readUint32();

            uint32_t usage = data.readUint32();

            int buf;

            int buf = 0;

            sp<Fence> fence;

            sp<Fence> fence;

            int result = dequeueBuffer(&buf, &fence, async, width, height,

            int result = dequeueBuffer(&buf, &fence, async, width, height,

                    format, usage);

                    format, usage);
@@ -416,7 +416,7 @@ status_t BnGraphicBufferProducer::onTransact( 
        }

        }

        case QUERY: {

        case QUERY: {

            CHECK_INTERFACE(IGraphicBufferProducer, data, reply);

            CHECK_INTERFACE(IGraphicBufferProducer, data, reply);

            int value;

            int value = 0;

            int what = data.readInt32();

            int what = data.readInt32();

            int res = query(what, &value);

            int res = query(what, &value);

            reply->writeInt32(value);

            reply->writeInt32(value);