drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "fix a bug where timeouts would only be handled when a message was delivered" into gingerbread

Browse Source
This commit is contained in:
Mathias Agopian
2010-10-11 12:41:33 -07:00
committed by Android (Google) Code Review
parent 1010da2e02 b921d30263
commit a7c76d8307
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
services/surfaceflinger/MessageQueue.cpp
View File

@ -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;
}
}