commit 08bad20ee7ecbe0da0f1caa9455a54f1948e35b9
author Jamie Gennis <jgennis@google.com> Wed Oct 19 11:08:11 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 19 11:08:11 2011 -0700
tree d0ba89c14707ae583b9c681eb52cc8cda629d534
parent c1c24304316b3cd3bef89169de5aeb33564e756a
parent 827d069afb297b6d96c995c03da9d4ee17e60679

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

* commit '827d069afb297b6d96c995c03da9d4ee17e60679':
  SurfaceTexture: free buffers when disconnect fails

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;