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

Merge "libgui: Change detachNextBuffer to return sp<GB>"

Browse Source
This commit is contained in:
Dan Stoza 2015-04-28 17:36:54 +00:00 committed by Gerrit Code Review
commit b5c7ccfdc7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/gui/Surface.h
View File

@ -179,7 +179,7 @@ public:
virtual int unlockAndPost(); virtual int unlockAndPost();
virtual int connect(int api, const sp<IProducerListener>& listener); virtual int connect(int api, const sp<IProducerListener>& listener);
virtual int detachNextBuffer(ANativeWindowBuffer** outBuffer, virtual int detachNextBuffer(sp<GraphicBuffer>* outBuffer,
sp<Fence>* outFence); sp<Fence>* outFence);
virtual int attachBuffer(ANativeWindowBuffer*); virtual int attachBuffer(ANativeWindowBuffer*);

4
libs/gui/Surface.cpp
View File

@ -651,7 +651,7 @@ int Surface::disconnect(int api) {
return err; return err;
} }
int Surface::detachNextBuffer(ANativeWindowBuffer** outBuffer, int Surface::detachNextBuffer(sp<GraphicBuffer>* outBuffer,
sp<Fence>* outFence) { sp<Fence>* outFence) {
ATRACE_CALL(); ATRACE_CALL();
ALOGV("Surface::detachNextBuffer"); ALOGV("Surface::detachNextBuffer");
@ -670,7 +670,7 @@ int Surface::detachNextBuffer(ANativeWindowBuffer** outBuffer,
return result; return result;
} }
*outBuffer = buffer.get(); *outBuffer = buffer;
if (fence != NULL && fence->isValid()) { if (fence != NULL && fence->isValid()) {
*outFence = fence; *outFence = fence;
} else { } else {