summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2011-08-17 15:42:04 -0700
committerMathias Agopian <mathias@google.com>2011-08-17 15:49:13 -0700
commit8618ebcc5d20a5983da1fc6200d50c3662aca6e3 (patch)
tree56e364cad0f30931fb430f68bb7d40f483d68e8e /include
parent1a227437be33157175b4de5f47d08a02647ee71a (diff)
downloadframeworks_base-8618ebcc5d20a5983da1fc6200d50c3662aca6e3.zip
frameworks_base-8618ebcc5d20a5983da1fc6200d50c3662aca6e3.tar.gz
frameworks_base-8618ebcc5d20a5983da1fc6200d50c3662aca6e3.tar.bz2
don't return the current buffer from dequeueBuffer
we were not reseting mCurrentTexture in some situations which in turn caused dequeueBuffers() return a "FREE" buffer that was also current. Very often it was harmless, but it created a race with updateTexImage() which could cause the following queueBuffers() to fail. Bug: 5156325 Change-Id: If15a31dc869117543d220d6e5562c57116cbabdb
Diffstat (limited to 'include')
-rw-r--r--include/gui/SurfaceTexture.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/gui/SurfaceTexture.h b/include/gui/SurfaceTexture.h
index a6fb12e..493993d 100644
--- a/include/gui/SurfaceTexture.h
+++ b/include/gui/SurfaceTexture.h
@@ -275,7 +275,7 @@ private:
enum BufferState {
// FREE indicates that the buffer is not currently being used and
// will not be used in the future until it gets dequeued and
- // subseqently queued by the client.
+ // subsequently queued by the client.
FREE = 0,
// DEQUEUED indicates that the buffer has been dequeued by the