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

This commit is contained in:
Mathias Agopian
2011-01-18 16:52:33 -08:00
committed by Android (Google) Code Review

View File

@@ -261,8 +261,7 @@ bool SharedBufferClient::LockCondition::operator()() const {
// NOTE: if stack.head is messed up, we could crash the client // 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 // or cause some drawing artifacts. This is okay, as long as it is
// limited to the client. // limited to the client.
return (buf != stack.index[stack.head] || return (buf != stack.index[stack.head]);
(stack.queued > 0 && stack.inUse != buf));
} }
SharedBufferServer::BuffersAvailableCondition::BuffersAvailableCondition( SharedBufferServer::BuffersAvailableCondition::BuffersAvailableCondition(