ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

fix a bug where timeouts would only be handled when a message was delivered

Browse Source 
Change-Id: Id3127b21c1a1a1afab32911a8edbb202360d7c9b
This commit is contained in:
Mathias Agopian 2010-10-07 19:59:06 -07:00
parent 58959343db
commit 954fdd27ca
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
services/surfaceflinger/MessageQueue.cpp
View File

@ -91,19 +91,23 @@ sp<MessageBase> MessageQueue::waitMessage(nsecs_t timeout)
mMessages.remove(cur); mMessages.remove(cur);
break; break;
} }
if (timeout>=0 && timeoutTime < now) {
// we timed-out, return a NULL message
result = 0;
break;
}
nextEventTime = result->when; nextEventTime = result->when;
result = 0; result = 0;
} }
if (timeout >= 0 && nextEventTime > 0) { if (timeout >= 0) {
if (timeoutTime < now) {
// we timed-out, return a NULL message
result = 0;
break;
}
if (nextEventTime > 0) {
if (nextEventTime > timeoutTime) { if (nextEventTime > timeoutTime) {
nextEventTime = timeoutTime; nextEventTime = timeoutTime;
} }
} else {
nextEventTime = timeoutTime;
}
} }
if (nextEventTime >= 0) { if (nextEventTime >= 0) {