diff options
| author | Mathias Agopian <mathias@google.com> | 2011-01-18 16:52:33 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-18 16:52:33 -0800 |
| commit | 2872eb075ca05d9f0be89a70772aea2e625602b3 (patch) | |
| tree | 7f17abfbd0b95e54e4e38037f5f41dc387633b1d | |
| parent | 002951dd3a8078009e5954330b7660b19a39b0ca (diff) | |
| parent | ed8a50c9c5bdefe4b347c6de12b8f6b947235164 (diff) | |
| download | frameworks_native-2872eb075ca05d9f0be89a70772aea2e625602b3.zip frameworks_native-2872eb075ca05d9f0be89a70772aea2e625602b3.tar.gz frameworks_native-2872eb075ca05d9f0be89a70772aea2e625602b3.tar.bz2 | |
Merge "fix [3361121] hang in glClear() - device unresponsive, OTA fails" into honeycomb
| -rw-r--r-- | libs/surfaceflinger_client/SharedBufferStack.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
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 @@ bool SharedBufferClient::LockCondition::operator()() const { // 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( |