surfaceflinger: remove SurfaceFlingerConsumer
Move everything into the base class, BufferLayerConsumer.
Test: boots
Change-Id: I62cd88d1bd0c7686f8c44e7b70cf216ffc2fba89
diff --git a/services/surfaceflinger/BufferLayerConsumer.cpp b/services/surfaceflinger/BufferLayerConsumer.cpp
index 3ebc959..5569dfa 100644
--- a/services/surfaceflinger/BufferLayerConsumer.cpp
+++ b/services/surfaceflinger/BufferLayerConsumer.cpp
@@ -270,6 +270,11 @@
return err;
}
+status_t BufferLayerConsumer::bindTextureImage() {
+ Mutex::Autolock lock(mMutex);
+ return bindTextureImageLocked();
+}
+
void BufferLayerConsumer::setReleaseFence(const sp<Fence>& fence) {
if (!fence->isValid()) {
return;
@@ -304,6 +309,11 @@
return true;
}
+sp<Fence> BufferLayerConsumer::getPrevFinalReleaseFence() const {
+ Mutex::Autolock lock(mMutex);
+ return ConsumerBase::mPrevFinalReleaseFence;
+}
+
status_t BufferLayerConsumer::acquireBufferLocked(BufferItem* item, nsecs_t presentWhen,
uint64_t maxFrameNumber) {
status_t err = ConsumerBase::acquireBufferLocked(item, presentWhen, maxFrameNumber);