commit a200fe8c1c45b399a5ee58793565b6ba6d4d29a4
author Treehugger Robot <treehugger-gerrit@google.com> Mon Nov 01 12:19:28 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 01 12:19:28 2021 +0000
tree a9b4a7423acc7d2c72b74ff077f63426d579ee7f
parent 31ac2124285c9a184d90fe0c3f883080196286e3
parent f63e4597a3afba59e7f23732c9f3fa2579f189a9

Merge "Shorten a timeout"

tests/unit/java/com/android/server/ConnectivityServiceTest.java

diff --git a/tests/unit/java/com/android/server/ConnectivityServiceTest.java b/tests/unit/java/com/android/server/ConnectivityServiceTest.java
index 3be63d8..bc50d0d 100644
--- a/tests/unit/java/com/android/server/ConnectivityServiceTest.java
+++ b/tests/unit/java/com/android/server/ConnectivityServiceTest.java
@@ -9402,7 +9402,7 @@
         // Make sure BatteryStats was not told about any v4- interfaces, as none should have
         // come online yet.
         waitForIdle();
-        assertNull(readHead.poll(TIMEOUT_MS, ri -> mServiceContext.equals(ri.context)
+        assertNull(readHead.poll(0 /* timeout */, ri -> mServiceContext.equals(ri.context)
                 && ri.iface != null && ri.iface.startsWith("v4-")));
 
         verifyNoMoreInteractions(mMockNetd);