diff options
| author | 2015-04-01 18:41:24 +0000 | |
|---|---|---|
| committer | 2015-04-01 18:41:24 +0000 | |
| commit | ef62116d802237ebac77465d6ff6779ecfe038ae (patch) | |
| tree | 46472fd12ca63219a6d619ad3619e643cd74226f /include/gui/ConsumerBase.h | |
| parent | 5881c8dd3b5b290cddca0e0f01e2c2f1641826b0 (diff) | |
| parent | 1c87e474d87d6d1380fb61d476d606b1a2fda1c1 (diff) | |
Merge "DO NOT MERGE libgui: Remove IGBC::BufferItem"
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. |