ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

Merge "attempt to fix bug 5313580" into ics-mr1

Browse Source
This commit is contained in:
Mathias Agopian 2011-11-18 12:11:15 -08:00 committed by Android (Google) Code Review
commit 6285c6cf10
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/gui/SurfaceTextureClient.h
View File

@ -40,6 +40,7 @@ public:
protected: protected:
SurfaceTextureClient(); SurfaceTextureClient();
virtual ~SurfaceTextureClient();
void setISurfaceTexture(const sp<ISurfaceTexture>& surfaceTexture); void setISurfaceTexture(const sp<ISurfaceTexture>& surfaceTexture);
private: private:

6
libs/gui/SurfaceTextureClient.cpp
View File

@ -36,6 +36,12 @@ SurfaceTextureClient::SurfaceTextureClient() {
SurfaceTextureClient::init(); SurfaceTextureClient::init();
} }
SurfaceTextureClient::~SurfaceTextureClient() {
if (mConnectedToCpu) {
SurfaceTextureClient::disconnect(NATIVE_WINDOW_API_CPU);
}
}
void SurfaceTextureClient::init() { void SurfaceTextureClient::init() {
// Initialize the ANativeWindow function pointers. // Initialize the ANativeWindow function pointers.
ANativeWindow::setSwapInterval = hook_setSwapInterval; ANativeWindow::setSwapInterval = hook_setSwapInterval;