commit a0db308c3d62301ae41b2e2bcf295c4ee4c7b08e
author Mathias Agopian <mathias@google.com> Mon Apr 23 13:59:36 2012 -0700
committer Mathias Agopian <mathias@google.com> Mon Apr 23 20:06:02 2012 -0700
tree 1a4822c37b80fc383a837679e8a8da775cd460e3
parent bce2d744b7dae4b242e0c79e95efd6ea717653d6

remove SurfaceTexture::connect()

use BufferQueue::connect() instead

Change-Id: I04aab7cf11304bf962cde38470747f3b19ddba42

include/gui/SurfaceTexture.h

diff --git a/include/gui/SurfaceTexture.h b/include/gui/SurfaceTexture.h
index 3699cdf..f4ed226 100644
--- a/include/gui/SurfaceTexture.h
+++ b/include/gui/SurfaceTexture.h
@@ -185,8 +185,6 @@
     status_t setConsumerUsageBits(uint32_t usage);
     status_t setTransformHint(uint32_t hint);
     virtual status_t setSynchronousMode(bool enabled);
-    virtual status_t connect(int api,
-                uint32_t* outWidth, uint32_t* outHeight, uint32_t* outTransform);
 
     // getBufferQueue returns the BufferQueue object to which this
     // SurfaceTexture is connected.

libs/gui/SurfaceTexture.cpp

diff --git a/libs/gui/SurfaceTexture.cpp b/libs/gui/SurfaceTexture.cpp
index a6e8dbf..6562a94 100644
--- a/libs/gui/SurfaceTexture.cpp
+++ b/libs/gui/SurfaceTexture.cpp
@@ -743,13 +743,6 @@
     return mBufferQueue;
 }
 
-// Used for refactoring, should not be in final interface
-status_t SurfaceTexture::connect(int api,
-                uint32_t* outWidth, uint32_t* outHeight, uint32_t* outTransform) {
-    Mutex::Autolock lock(mMutex);
-    return mBufferQueue->connect(api, outWidth, outHeight, outTransform);
-}
-
 void SurfaceTexture::onFrameAvailable() {
     ST_LOGV("onFrameAvailable");
 

services/surfaceflinger/Layer.cpp

diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index 6d77daf..e15e733 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -101,11 +101,8 @@
     // Creates a custom BufferQueue for SurfaceTexture to use
     sp<BufferQueue> bq = new SurfaceTextureLayer();
     mSurfaceTexture = new SurfaceTexture(mTextureName, true,
-            GL_TEXTURE_EXTERNAL_OES, false,bq);
+            GL_TEXTURE_EXTERNAL_OES, false, bq);
 
-
-
-    mSurfaceTexture->setTransformHint(getTransformHint());
     mSurfaceTexture->setConsumerUsageBits(getEffectiveUsage(0));
     mSurfaceTexture->setFrameAvailableListener(new FrameQueuedListener(this));
     mSurfaceTexture->setSynchronousMode(true);