diff options
| author | Jamie Gennis <jgennis@google.com> | 2011-01-15 17:01:51 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-15 17:01:51 -0800 |
| commit | 39de45846cd9431e9fc1ee44591152bc566f9858 (patch) | |
| tree | 5f2e57ebd98b78282c723076648a938b5d35345b /libs | |
| parent | 80a44401a22344f7eabce6976372ab144ef22893 (diff) | |
| parent | 4559ea41d849714aba4dffeeb13aa9ee648b7327 (diff) | |
| download | frameworks_base-39de45846cd9431e9fc1ee44591152bc566f9858.zip frameworks_base-39de45846cd9431e9fc1ee44591152bc566f9858.tar.gz frameworks_base-39de45846cd9431e9fc1ee44591152bc566f9858.tar.bz2 | |
Merge "Compare GraphicBuffers using handles." into honeycomb
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/gui/SurfaceTextureClient.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/gui/SurfaceTextureClient.cpp b/libs/gui/SurfaceTextureClient.cpp index 24cee24..0ed8be5 100644 --- a/libs/gui/SurfaceTextureClient.cpp +++ b/libs/gui/SurfaceTextureClient.cpp @@ -111,7 +111,7 @@ int SurfaceTextureClient::cancelBuffer(android_native_buffer_t* buffer) { LOGV("SurfaceTextureClient::cancelBuffer"); Mutex::Autolock lock(mMutex); for (int i = 0; i < NUM_BUFFER_SLOTS; i++) { - if (mSlots[i].get() == buffer) { + if (mSlots[i]->handle == buffer->handle) { mSurfaceTexture->cancelBuffer(i); return OK; } @@ -129,7 +129,7 @@ int SurfaceTextureClient::queueBuffer(android_native_buffer_t* buffer) { LOGV("SurfaceTextureClient::queueBuffer"); Mutex::Autolock lock(mMutex); for (int i = 0; i < NUM_BUFFER_SLOTS; i++) { - if (mSlots[i].get() == GraphicBuffer::getSelf(buffer)) { + if (mSlots[i]->handle == buffer->handle) { return mSurfaceTexture->queueBuffer(i); } } |