Merge "fix a bug where timeouts would only be handled when a message was delivered" (118c8490) · Commits · e / os / android_frameworks_base

services/surfaceflinger/MessageQueue.cpp

+11 −7

Original line number	Diff line number	Diff line
		@@ -91,19 +91,23 @@ 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 (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;
		}
		}

		if (nextEventTime >= 0) {