commit ef4488fb0daa80bdac893a2da2ed018fd32e7cc3
author James Mattis <jmattis@google.com> Fri Jan 15 00:28:54 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 15 00:28:54 2021 +0000
tree 5c39721aefa464d5a34245a89edeed8d338179fb
parent d0cb8f3ec37a5203c986ecfd0d5dd7a7aeef6ee1
parent 5b6728296627f5bfcca80708b4e38220d99258e7

Merge "Waiting for idle in test"

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

diff --git a/tests/net/java/com/android/server/ConnectivityServiceTest.java b/tests/net/java/com/android/server/ConnectivityServiceTest.java
index b6e6816..4a282e8 100644
--- a/tests/net/java/com/android/server/ConnectivityServiceTest.java
+++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java
@@ -8429,6 +8429,7 @@
         mCm.registerNetworkCallback(genericRequest, genericNetworkCallback);
         mCm.registerNetworkCallback(wifiRequest, wifiNetworkCallback);
         mCm.registerNetworkCallback(cellRequest, cellNetworkCallback);
+        waitForIdle();
 
         final ConnectivityService.NetworkRequestInfo[] nriOutput = mService.requestsSortedById();