Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e109a86 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android Git Automerger
Browse files

am d0528b74: Merge "deliver invalidate messages AFTER other messages" into gingerbread 

Merge commit 'd0528b74b6de87c415ea498095e142d52c68875b' into gingerbread-plus-aosp

* commit 'd0528b74b6de87c415ea498095e142d52c68875b':
  deliver invalidate messages AFTER other messages
parents 167af513 eea35e1e

services/surfaceflinger/MessageQueue.cpp

+8 −8
Original line number Diff line number Diff line
@@ -72,14 +72,6 @@ sp<MessageBase> MessageQueue::waitMessage(nsecs_t timeout) 
            nsecs_t now = systemTime();

            nsecs_t nextEventTime = -1;



            // invalidate messages are always handled first

            if (mInvalidate) {

                mInvalidate = false;

                mInvalidateMessage->when = now;

                result = mInvalidateMessage;

                break;

            }



            LIST::iterator cur(mMessages.begin());

            if (cur != mMessages.end()) {

                result = *cur;
@@ -95,6 +87,14 @@ sp<MessageBase> MessageQueue::waitMessage(nsecs_t timeout) 
                result = 0;

            }



            // see if we have an invalidate message

            if (mInvalidate) {

                mInvalidate = false;

                mInvalidateMessage->when = now;

                result = mInvalidateMessage;

                break;

            }



            if (timeout >= 0) {

                if (timeoutTime < now) {

                    // we timed-out, return a NULL message