commit 483bccd0d9f7e5e7aa452e9e3e53056387f4b25c
author Jamie Gennis <jgennis@google.com> Mon Aug 20 14:28:21 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 20 14:28:21 2012 -0700
tree cb381633384a19a10064536b60a571f8c6fb2076
parent f8d33c652b930abbfb0722f3a2928cbc2ea71078

Revert "SurfaceTexture: call ConsumerBase::freeBufferLocked"

This reverts commit f8d33c652b930abbfb0722f3a2928cbc2ea71078

Change-Id: I1ff2e1cc85824a8fac1051f573d2931db81af511

include/gui/SurfaceTexture.h

diff --git a/include/gui/SurfaceTexture.h b/include/gui/SurfaceTexture.h
index 98741c5..0a83ce6 100644
--- a/include/gui/SurfaceTexture.h
+++ b/include/gui/SurfaceTexture.h
@@ -248,7 +248,7 @@
     // slot and destroy the EGLImage in that slot.  Otherwise it has no effect.
     //
     // This method must be called with mMutex locked.
-    virtual void freeBufferLocked(int slotIndex);
+    void freeBufferLocked(int slotIndex);
 
     // computeCurrentTransformMatrix computes the transform matrix for the
     // current texture.  It uses mCurrentTransform and the current GraphicBuffer

libs/gui/SurfaceTexture.cpp

diff --git a/libs/gui/SurfaceTexture.cpp b/libs/gui/SurfaceTexture.cpp
index 0579a3d..451ccc2 100644
--- a/libs/gui/SurfaceTexture.cpp
+++ b/libs/gui/SurfaceTexture.cpp
@@ -710,7 +710,6 @@
         eglDestroyImageKHR(mEglDisplay, img);
     }
     mEglSlots[slotIndex].mEglImage = EGL_NO_IMAGE_KHR;
-    ConsumerBase::freeBufferLocked(slotIndex);
 }
 
 void SurfaceTexture::abandonLocked() {