diff options
| author | Mathias Agopian <mathias@google.com> | 2011-11-18 15:22:59 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-18 15:22:59 -0800 |
| commit | 36bd710a6094282c8f9a6083c3b09911bf8a5ac7 (patch) | |
| tree | d9f63cb4b22b64f342445b4f131ff3894a31446e /libs | |
| parent | 3f6114164f87567d069fe37962b3d1952f5905e5 (diff) | |
| parent | d0df44b5c979e00a19187cea35768ba26557e447 (diff) | |
| download | frameworks_base-36bd710a6094282c8f9a6083c3b09911bf8a5ac7.zip frameworks_base-36bd710a6094282c8f9a6083c3b09911bf8a5ac7.tar.gz frameworks_base-36bd710a6094282c8f9a6083c3b09911bf8a5ac7.tar.bz2 | |
am d0df44b5: am 4d71053b: Merge "attempt to fix bug 5313580" into ics-mr1
* commit 'd0df44b5c979e00a19187cea35768ba26557e447':
attempt to fix bug 5313580
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/gui/SurfaceTextureClient.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libs/gui/SurfaceTextureClient.cpp b/libs/gui/SurfaceTextureClient.cpp index f66e25f..3d47f05 100644 --- a/libs/gui/SurfaceTextureClient.cpp +++ b/libs/gui/SurfaceTextureClient.cpp @@ -36,6 +36,12 @@ SurfaceTextureClient::SurfaceTextureClient() { SurfaceTextureClient::init(); } +SurfaceTextureClient::~SurfaceTextureClient() { + if (mConnectedToCpu) { + SurfaceTextureClient::disconnect(NATIVE_WINDOW_API_CPU); + } +} + void SurfaceTextureClient::init() { // Initialize the ANativeWindow function pointers. ANativeWindow::setSwapInterval = hook_setSwapInterval; |