diff options
| author | 2025-01-09 22:50:37 +0000 | |
|---|---|---|
| committer | 2025-01-10 10:39:30 -0800 | |
| commit | 2a8c23fc71dc2378d983f007adc11da08fc7afa3 (patch) | |
| tree | 10c8217cdced1e26cc79a49044c28466b9760d65 | |
| parent | a51dcf16d3b3b6e26a951e23fe5944f51064c072 (diff) | |
Return times in future in peekWhenForTest.
Previously peekWhenForTest only returns a value if when <= current time.
This contradicts the spec for TestLooperManager#peekWhen.
Flag: android.os.message_queue_testability
Bug: 112000181
Test: atest TestLooperManagerTest
Change-Id: Ic3dcb2b9c0230786ca33245debae2bb4b549abc1
| -rw-r--r-- | core/java/android/os/CombinedMessageQueue/MessageQueue.java | 7 | ||||
| -rw-r--r-- | core/java/android/os/LegacyMessageQueue/MessageQueue.java | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/core/java/android/os/CombinedMessageQueue/MessageQueue.java b/core/java/android/os/CombinedMessageQueue/MessageQueue.java index 230fa3fec930..4b406e2a603b 100644 --- a/core/java/android/os/CombinedMessageQueue/MessageQueue.java +++ b/core/java/android/os/CombinedMessageQueue/MessageQueue.java @@ -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; @@ -1286,12 +1285,12 @@ public final class MessageQueue { } 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 c0333e914b4d..d12d99a71251 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 @@ public final class MessageQueue { } 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) { |