commit 246bd60efa89376918e5d4cd53d2ed4f9288bf8d
author Mathias Agopian <mathias@google.com> Tue Jan 18 18:39:02 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 18 18:39:02 2011 -0800
tree 3d806e4928174aa254e41b76b2e1a28dc05235cb
parent 31cd02ade3dd85c676bb278a1c2181f57179c390
parent fc14d42b75d25b5062613333331839c895621f3b

am fc14d42b: Merge "fix [3361121] hang in glClear() - device unresponsive, OTA fails" into honeycomb

* commit 'fc14d42b75d25b5062613333331839c895621f3b':
  fix [3361121] hang in glClear() - device unresponsive, OTA fails

libs/surfaceflinger_client/SharedBufferStack.cpp

diff --git a/libs/surfaceflinger_client/SharedBufferStack.cpp b/libs/surfaceflinger_client/SharedBufferStack.cpp
index 3b2ef84..af11f97 100644
--- a/libs/surfaceflinger_client/SharedBufferStack.cpp
+++ b/libs/surfaceflinger_client/SharedBufferStack.cpp
@@ -261,8 +261,7 @@
     // NOTE: if stack.head is messed up, we could crash the client
     // or cause some drawing artifacts. This is okay, as long as it is
     // limited to the client.
-    return (buf != stack.index[stack.head] ||
-            (stack.queued > 0 && stack.inUse != buf));
+    return (buf != stack.index[stack.head]);
 }
 
 SharedBufferServer::BuffersAvailableCondition::BuffersAvailableCondition(