commit ecb90864e726b45ec35c26acb1e861c72a12486d
author The Android Automerger <android-build@android.com> Wed Oct 19 19:01:02 2011 -0700
committer The Android Automerger <android-build@android.com> Wed Oct 19 19:01:02 2011 -0700
tree 2ab7728b09dfdb17c6750dc0a1a8e93d6d2594d5
parent 60b195831c19213bb856f74076a9458603c357ac
parent 0e66387805d56c6be211d46377f16b4b17ae7f1f

merge in ics-mr0-release history after reset to ics-mr0

libs/gui/SurfaceTextureClient.cpp

diff --git a/libs/gui/SurfaceTextureClient.cpp b/libs/gui/SurfaceTextureClient.cpp
index 0bee0f1..98fa171 100644
--- a/libs/gui/SurfaceTextureClient.cpp
+++ b/libs/gui/SurfaceTextureClient.cpp
@@ -409,9 +409,9 @@
 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;