ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* commit 'c4bd7211373cf5b745c7d4f849f43f7a2d2b1141':
  resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev
This commit is contained in:
Naveen Leekha 2015-09-24 23:27:31 +00:00 committed by Android Git Automerger
commit 69412a51f5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/gui/IGraphicBufferProducer.cpp
View File

@ -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);