diff options
| author | Dan Stoza <stoza@google.com> | 2015-04-27 11:06:01 -0700 |
|---|---|---|
| committer | Dan Stoza <stoza@google.com> | 2015-04-27 11:16:15 -0700 |
| commit | 745ac038b986d826a767ddc891a224b59165e9fb (patch) | |
| tree | 2fb219e0bd8bca39a2fcfc99c661769cc770580c | |
| parent | bec3de4ac527f8df1b3fd1b3d0ee2feaa633646a (diff) | |
| download | native-745ac038b986d826a767ddc891a224b59165e9fb.tar.gz | |
libgui: Change detachNextBuffer to return sp<GB>
Changes Surface::detachNextBuffer to return an sp<GraphicBuffer>
instead of an ANativeWindowBuffer* to ensure that reference counting
works correctly.
Bug: 20092217
Change-Id: I3979ea6121aaf14845f0554477b778770413581e
| -rw-r--r-- | include/gui/Surface.h | 2 | ||||
| -rw-r--r-- | libs/gui/Surface.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/gui/Surface.h b/include/gui/Surface.h index a9f78cf029..fd6d48c2a9 100644 --- a/include/gui/Surface.h +++ b/include/gui/Surface.h @@ -179,7 +179,7 @@ public: virtual int unlockAndPost(); virtual int connect(int api, const sp<IProducerListener>& listener); - virtual int detachNextBuffer(ANativeWindowBuffer** outBuffer, + virtual int detachNextBuffer(sp<GraphicBuffer>* outBuffer, sp<Fence>* outFence); virtual int attachBuffer(ANativeWindowBuffer*); diff --git a/libs/gui/Surface.cpp b/libs/gui/Surface.cpp index b8acad2a85..5d81f10a49 100644 --- a/libs/gui/Surface.cpp +++ b/libs/gui/Surface.cpp @@ -651,7 +651,7 @@ int Surface::disconnect(int api) { return err; } -int Surface::detachNextBuffer(ANativeWindowBuffer** outBuffer, +int Surface::detachNextBuffer(sp<GraphicBuffer>* outBuffer, sp<Fence>* outFence) { ATRACE_CALL(); ALOGV("Surface::detachNextBuffer"); @@ -670,7 +670,7 @@ int Surface::detachNextBuffer(ANativeWindowBuffer** outBuffer, return result; } - *outBuffer = buffer.get(); + *outBuffer = buffer; if (fence != NULL && fence->isValid()) { *outFence = fence; } else { |