summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jamie Gennis <jgennis@google.com> 2011-10-19 11:06:05 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2011-10-19 11:06:05 -0700
commitc9362e7b0f53901c002ec81d65c812243427c534 (patch)
tree2ab7728b09dfdb17c6750dc0a1a8e93d6d2594d5
parent1248d07eb9ee3fbdd3b7e8c999e5342e6d779ac6 (diff)
parent13c5ca3b5562ac673a08b17790d89460729c6e7d (diff)
Merge "SurfaceTexture: free buffers when disconnect fails" into ics-mr0
-rw-r--r--libs/gui/SurfaceTextureClient.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/gui/SurfaceTextureClient.cpp b/libs/gui/SurfaceTextureClient.cpp
index 0bee0f17c0..98fa17174e 100644
--- a/libs/gui/SurfaceTextureClient.cpp
+++ b/libs/gui/SurfaceTextureClient.cpp
@@ -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;