diff options
author | Mathias Agopian <mathias@google.com> | 2010-10-11 12:41:33 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-11 12:41:33 -0700 |
commit | a7c76d8307a3b49bf5b8fdda3543455b0e5dd64c (patch) | |
tree | 08bca3e23f7c3ec802b7d3076470aa1037edfb1a | |
parent | 1010da2e02216b2f94fbe763a82d53201b340217 (diff) | |
parent | b921d302632d79a6dabab2885e454065509a1ab3 (diff) | |
download | frameworks_base-a7c76d8307a3b49bf5b8fdda3543455b0e5dd64c.zip frameworks_base-a7c76d8307a3b49bf5b8fdda3543455b0e5dd64c.tar.gz frameworks_base-a7c76d8307a3b49bf5b8fdda3543455b0e5dd64c.tar.bz2 |
Merge "fix a bug where timeouts would only be handled when a message was delivered" into gingerbread
-rw-r--r-- | services/surfaceflinger/MessageQueue.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/services/surfaceflinger/MessageQueue.cpp b/services/surfaceflinger/MessageQueue.cpp index d668e88..4fb1e61 100644 --- a/services/surfaceflinger/MessageQueue.cpp +++ b/services/surfaceflinger/MessageQueue.cpp @@ -91,17 +91,21 @@ sp<MessageBase> MessageQueue::waitMessage(nsecs_t timeout) mMessages.remove(cur); break; } - if (timeout>=0 && timeoutTime < now) { - // we timed-out, return a NULL message - result = 0; - break; - } nextEventTime = result->when; result = 0; } - if (timeout >= 0 && nextEventTime > 0) { - if (nextEventTime > timeoutTime) { + if (timeout >= 0) { + if (timeoutTime < now) { + // we timed-out, return a NULL message + result = 0; + break; + } + if (nextEventTime > 0) { + if (nextEventTime > timeoutTime) { + nextEventTime = timeoutTime; + } + } else { nextEventTime = timeoutTime; } } |