diff options
| author | 2015-02-19 16:10:43 -0800 | |
|---|---|---|
| committer | 2015-04-07 11:11:43 -0700 | |
| commit | 1c2001efcf56d7f65242249fa4e5833f03a68e37 (patch) | |
| tree | 79227b4adfac5c3aa4d7ef31bcfce17acc42acf0 /include/gui/ConsumerBase.h | |
| parent | 2d4cf62a2cdfbfbbca5757eb7dd1498d118bf7c9 (diff) | |
Cherry-pick dataSpace and BufferItem changes
Add dataSpace to buffer queues; remove old format enums.
(cherry picked from commit 82c6bcc9705eabcaf5b9e45bc81867b0e2d61a02)
libgui: Prepare for IGBC::BufferItem removal
(cherry picked from commit cf3834db104e0b052056e3a06d46e3f222f0d372)
SurfaceFlinger: Stop using IGBC::BufferItem
(cherry picked from commit 11611f9be590480d7ea27bf0153558573ddcded2)
Change-Id: Ic2e4770b916d2d1477e5ce98c4b49a0072ea03ff
(cherry picked from commit 6c450101753d0219b151e79007bcded1bfbb058b)
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. |