Merge "SurfaceTextureClient: remove a deprecated ctor"

This commit is contained in:
Jamie Gennis 2012-12-12 12:16:21 -08:00 committed by Android (Google) Code Review
commit 3c1ada9822
2 changed files with 0 additions and 14 deletions

View File

@ -41,12 +41,6 @@ public:
SurfaceTextureClient(const sp<ISurfaceTexture>& surfaceTexture);
// SurfaceTextureClient is overloaded to assist in refactoring ST and BQ.
// SurfaceTexture is no longer an ISurfaceTexture, so client code
// calling the original constructor will fail. Thus this convenience method
// passes in the surfaceTexture's bufferQueue to the init method.
SurfaceTextureClient(const sp<SurfaceTexture>& surfaceTexture);
sp<ISurfaceTexture> getISurfaceTexture() const;
protected:

View File

@ -41,14 +41,6 @@ SurfaceTextureClient::SurfaceTextureClient(
SurfaceTextureClient::setISurfaceTexture(surfaceTexture);
}
// see SurfaceTextureClient.h
SurfaceTextureClient::SurfaceTextureClient(const
sp<SurfaceTexture>& surfaceTexture)
{
SurfaceTextureClient::init();
SurfaceTextureClient::setISurfaceTexture(surfaceTexture->getBufferQueue());
}
SurfaceTextureClient::SurfaceTextureClient() {
SurfaceTextureClient::init();
}