diff options
| author | 2015-04-07 21:16:33 +0000 | |
|---|---|---|
| committer | 2015-04-07 21:16:33 +0000 | |
| commit | e55cae86e6217a86d94bf280c6c8442bef2dd908 (patch) | |
| tree | 11f9d8e105c8825ae00001d489442434c57d0731 /include/gui/ConsumerBase.h | |
| parent | 9e99fce820c2d520f5618cb620cc1e37aed57b9d (diff) | |
| parent | 955c8974820ce98a291b3f251cc60ca4ea578511 (diff) | |
Merge "libgui: Remove IGBC::BufferItem" into stage-aosp-master
Diffstat (limited to 'include/gui/ConsumerBase.h')
| -rw-r--r-- | include/gui/ConsumerBase.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/gui/ConsumerBase.h b/include/gui/ConsumerBase.h index 46ad20e7b3..ef0feab720 100644 --- a/include/gui/ConsumerBase.h +++ b/include/gui/ConsumerBase.h @@ -154,7 +154,6 @@ protected: // to a slot. If it is overridden the derived class's implementation must // call ConsumerBase::acquireBufferLocked. virtual status_t acquireBufferLocked(BufferItem *item, nsecs_t presentWhen); - virtual status_t acquireBufferLocked(BufferQueue::BufferItem *item, nsecs_t presentWhen); // releaseBufferLocked relinquishes control over a buffer, returning that // control to the BufferQueue. |