Merge "Return times in future in peekWhenForTest." into main (966324df) · Commits · e / os / android_frameworks_base

core/java/android/os/CombinedMessageQueue/MessageQueue.java

+3 −4

Original line number	Diff line number	Diff line
		@@ -36,7 +36,6 @@ import android.util.Printer;
		import android.util.SparseArray;
		import android.util.proto.ProtoOutputStream;

		import com.android.internal.annotations.GuardedBy;
		import com.android.internal.ravenwood.RavenwoodEnvironment;

		import dalvik.annotation.optimization.NeverCompile;
		@@ -1392,12 +1391,12 @@ public final class MessageQueue {
		} while (msg != null && !msg.isAsynchronous());
		}
		if (msg != null) {
		if (now >= msg.when) {
		// Got a message.
		mBlocked = false;
		if (peek) {
		return msg;
		}
		if (now >= msg.when) {
		// Got a message.
		mBlocked = false;
		if (prevMsg != null) {
		prevMsg.next = msg.next;
		if (prevMsg.next == null) {

+3 −4

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package android.os;

		import android.annotation.FlaggedApi;
		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		@@ -754,12 +753,12 @@ public final class MessageQueue {
		} while (msg != null && !msg.isAsynchronous());
		}
		if (msg != null) {
		if (now >= msg.when) {
		// Got a message.
		mBlocked = false;
		if (peek) {
		return msg;
		}
		if (now >= msg.when) {
		// Got a message.
		mBlocked = false;
		if (prevMsg != null) {
		prevMsg.next = msg.next;
		if (prevMsg.next == null) {