commit 5865c494a571a7e164218857d3b860004c50baf6
author Jamie Gennis <jgennis@google.com> Thu Jan 13 12:13:56 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 13 12:13:56 2011 -0800
tree 17bbc137c8b9cc66ca320203a378fa772c80465f
parent 8eff45242180c7dec2b437c3929cb7ea3345f60c
parent a7eacc148adec1ee26636a0c727ceefa9e012ba6

Merge "Fix a bug in SurfaceTexture::dequeueBuffer." into honeycomb

libs/gui/SurfaceTexture.cpp

diff --git a/libs/gui/SurfaceTexture.cpp b/libs/gui/SurfaceTexture.cpp
index 28f3dc2..1389ed6 100644
--- a/libs/gui/SurfaceTexture.cpp
+++ b/libs/gui/SurfaceTexture.cpp
@@ -131,7 +131,7 @@
     Mutex::Autolock lock(mMutex);
     int found = INVALID_BUFFER_SLOT;
     for (int i = 0; i < mBufferCount; i++) {
-        if (!mSlots[i].mOwnedByClient && i != mCurrentTexture) {
+        if (!mSlots[i].mOwnedByClient && i != mCurrentTexture && i != mLastQueued) {
             mSlots[i].mOwnedByClient = true;
             found = i;
             break;