Merge "Return times in future in peekWhenForTest." into main
diff --git a/core/java/android/os/CombinedMessageQueue/MessageQueue.java b/core/java/android/os/CombinedMessageQueue/MessageQueue.java
index d9969d8..3026609 100644
--- a/core/java/android/os/CombinedMessageQueue/MessageQueue.java
+++ b/core/java/android/os/CombinedMessageQueue/MessageQueue.java
@@ -36,7 +36,6 @@
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 @@
} while (msg != null && !msg.isAsynchronous());
}
if (msg != null) {
+ if (peek) {
+ return msg;
+ }
if (now >= msg.when) {
// Got a message.
mBlocked = false;
- if (peek) {
- return msg;
- }
if (prevMsg != null) {
prevMsg.next = msg.next;
if (prevMsg.next == null) {
diff --git a/core/java/android/os/LegacyMessageQueue/MessageQueue.java b/core/java/android/os/LegacyMessageQueue/MessageQueue.java
index c0333e9..d12d99a 100644
--- a/core/java/android/os/LegacyMessageQueue/MessageQueue.java
+++ b/core/java/android/os/LegacyMessageQueue/MessageQueue.java
@@ -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 @@
} while (msg != null && !msg.isAsynchronous());
}
if (msg != null) {
+ if (peek) {
+ return msg;
+ }
if (now >= msg.when) {
// Got a message.
mBlocked = false;
- if (peek) {
- return msg;
- }
if (prevMsg != null) {
prevMsg.next = msg.next;
if (prevMsg.next == null) {