Projects >> android-frameworks-base-with-screenshot-tweaks >>85c3fe443f7bd06ae0aae6074f4cf2960892cdc0

Chunk
Conflicting content
                final long now = SystemClock.uptimeMillis();
                final Message msg = mMessages;
                if (msg != null) {
<<<<<<< HEAD
                    msg.markInUse();
                    return msg;
=======
                    final long when = msg.when;
                    if (now >= when) {
                        mMessages = msg.next;
                        if (Config.LOGV) Log.v("MessageQueue", "Returning message: " + msg);
                        return msg;
                    } else {
                        nextPollTimeoutMillis = (int) Math.min(when - now, Integer.MAX_VALUE);
                    }
                } else {
                    nextPollTimeoutMillis = -1;
                }

                // If first time, then get the number of idlers to run.
                if (pendingIdleHandlerCount < 0) {
                    pendingIdleHandlerCount = mIdleHandlers.size();
>>>>>>> aa522ac8ba18475f9a05b04918cd9d1a5cd2f77e
                }
                if (pendingIdleHandlerCount == 0) {
                    // No idle handlers to run.  Loop and wait some more.
Solution content
                final long now = SystemClock.uptimeMillis();
                final Message msg = mMessages;
                if (msg != null) {
                    final long when = msg.when;
                    if (now >= when) {
                        mMessages = msg.next;
                        if (Config.LOGV) Log.v("MessageQueue", "Returning message: " + msg);
                        msg.markInUse();
                        return msg;
                    } else {
                        nextPollTimeoutMillis = (int) Math.min(when - now, Integer.MAX_VALUE);
                    }
                } else {
                    nextPollTimeoutMillis = -1;
                }

                // If first time, then get the number of idlers to run.
                if (pendingIdleHandlerCount < 0) {
                    pendingIdleHandlerCount = mIdleHandlers.size();
                }
                if (pendingIdleHandlerCount == 0) {
                    // No idle handlers to run.  Loop and wait some more.
File
MessageQueue.java
Developer's decision
Combination
Kind of conflict
Comment
If statement
Method invocation
Return statement
Variable