Merge "Shorten a timeout" am: a200fe8c1c am: f4016713ae am: b65a52ae31

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1877219

Change-Id: I438627f51aeebd18f05156d6a2f4c240dd3b26d3
This commit is contained in:
Treehugger Robot
2021-11-01 13:07:18 +00:00
committed by Automerger Merge Worker

View File

@@ -9402,7 +9402,7 @@ public class ConnectivityServiceTest {
// 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);