diff options
| author | Jamie Gennis <jgennis@google.com> | 2011-10-19 11:08:11 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-19 11:08:11 -0700 |
| commit | baf0e06dea2300ed79fb5874b706eb4115fc2ad7 (patch) | |
| tree | dc5549dd12f226f569e594d07131ac79df92f4ce /libs | |
| parent | 860573e62c586faa01a0298b4f44cae0649acd50 (diff) | |
| parent | c9362e7b0f53901c002ec81d65c812243427c534 (diff) | |
| download | frameworks_native-baf0e06dea2300ed79fb5874b706eb4115fc2ad7.zip frameworks_native-baf0e06dea2300ed79fb5874b706eb4115fc2ad7.tar.gz frameworks_native-baf0e06dea2300ed79fb5874b706eb4115fc2ad7.tar.bz2 | |
am 827d069a: Merge "SurfaceTexture: free buffers when disconnect fails" into ics-mr0
* commit '827d069afb297b6d96c995c03da9d4ee17e60679':
SurfaceTexture: free buffers when disconnect fails
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/gui/SurfaceTextureClient.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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::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; |