diff options
| author | Mathias Agopian <mathias@google.com> | 2011-11-18 12:11:15 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-18 12:11:15 -0800 |
| commit | 4d71053b0728b248d80d7d5a098df459722e2be0 (patch) | |
| tree | d35280fd9ed5c113422c928b469c2c788d427615 /libs | |
| parent | e6a96560ed96e5121db2e22168698f14338c8f1d (diff) | |
| parent | 90cbbd1f7f510e7c173f706919492a95e91a87e7 (diff) | |
| download | frameworks_base-4d71053b0728b248d80d7d5a098df459722e2be0.zip frameworks_base-4d71053b0728b248d80d7d5a098df459722e2be0.tar.gz frameworks_base-4d71053b0728b248d80d7d5a098df459722e2be0.tar.bz2 | |
Merge "attempt to fix bug 5313580" into ics-mr1
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 98fa171..48070d6 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; |