am 827d069a: Merge "SurfaceTexture: free buffers when disconnect fails" into ics-mr0

* commit '827d069afb297b6d96c995c03da9d4ee17e60679':
  SurfaceTexture: free buffers when disconnect fails
This commit is contained in:
Jamie Gennis
2011-10-19 11:08:11 -07:00
committed by Android Git Automerger

View File

@@ -409,9 +409,9 @@ int SurfaceTextureClient::connect(int api) {
int SurfaceTextureClient::disconnect(int api) {
LOGV("SurfaceTextureClient::disconnect");
Mutex::Autolock lock(mMutex);
freeAllBuffers();
int err = mSurfaceTexture->disconnect(api);
if (!err) {
freeAllBuffers();
mReqFormat = 0;
mReqWidth = 0;
mReqHeight = 0;