resolved conflicts for 7534e4e6
to lmp-mr1-ub-dev
Change-Id: I543df164076b44578b14d41031800bb62b81586d
This commit is contained in:
parent
e889592e33
commit
c4bd721137
@ -324,7 +324,7 @@ status_t BnGraphicBufferProducer::onTransact(
|
||||
uint32_t height = data.readUint32();
|
||||
PixelFormat format = static_cast<PixelFormat>(data.readInt32());
|
||||
uint32_t usage = data.readUint32();
|
||||
int buf;
|
||||
int buf = 0;
|
||||
sp<Fence> fence;
|
||||
int result = dequeueBuffer(&buf, &fence, async, width, height,
|
||||
format, usage);
|
||||
@ -392,7 +392,7 @@ status_t BnGraphicBufferProducer::onTransact(
|
||||
}
|
||||
case QUERY: {
|
||||
CHECK_INTERFACE(IGraphicBufferProducer, data, reply);
|
||||
int value;
|
||||
int value = 0;
|
||||
int what = data.readInt32();
|
||||
int res = query(what, &value);
|
||||
reply->writeInt32(value);
|
||||
|
Loading…
Reference in New Issue
Block a user