diff options
| author | 2015-03-20 18:47:47 +0000 | |
|---|---|---|
| committer | 2015-03-20 18:47:47 +0000 | |
| commit | 7d89f5b6562da8bb316f04f91dd7cc9fce33d7fd (patch) | |
| tree | 2f91ce8d63fa843b0a2e66086046e7637bf44d02 /include/gui/ConsumerBase.h | |
| parent | f44d13e7e574f181750fa37f439ab50cf05ab3df (diff) | |
| parent | cf3834db104e0b052056e3a06d46e3f222f0d372 (diff) | |
Merge "DO NOT MERGE libgui: Prepare for IGBC::BufferItem removal"
Diffstat (limited to 'include/gui/ConsumerBase.h')
| -rw-r--r-- | include/gui/ConsumerBase.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/gui/ConsumerBase.h b/include/gui/ConsumerBase.h index f7ab5ac59b..46ad20e7b3 100644 --- a/include/gui/ConsumerBase.h +++ b/include/gui/ConsumerBase.h @@ -153,8 +153,8 @@ protected: // initialization that must take place the first time a buffer is assigned // to a slot. If it is overridden the derived class's implementation must // call ConsumerBase::acquireBufferLocked. - virtual status_t acquireBufferLocked(IGraphicBufferConsumer::BufferItem *item, - nsecs_t presentWhen); + 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. |