From 5b6728296627f5bfcca80708b4e38220d99258e7 Mon Sep 17 00:00:00 2001
From: James Mattis <jmattis@google.com>
Date: Wed, 13 Jan 2021 13:52:02 -0800
Subject: [PATCH] Waiting for idle in test

Waiting for idle in testRequestsSortedByIdSortsCorrectly to give it time
to handle async operations as part of registering network callbacks.

Bug: 177376544
Test: atest FrameworksNetTests:ConnectivityServiceTest#
testRequestsSortedByIdSortsCorrectly --rerun-until-failure 200

Change-Id: I268c4607d1a4c79e79f1385f014563cea0c2f979
---
 tests/net/java/com/android/server/ConnectivityServiceTest.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/net/java/com/android/server/ConnectivityServiceTest.java b/tests/net/java/com/android/server/ConnectivityServiceTest.java
index 2e70be702b..b7ade9e226 100644
--- a/tests/net/java/com/android/server/ConnectivityServiceTest.java
+++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java
@@ -8395,6 +8395,7 @@ public class ConnectivityServiceTest {
         mCm.registerNetworkCallback(genericRequest, genericNetworkCallback);
         mCm.registerNetworkCallback(wifiRequest, wifiNetworkCallback);
         mCm.registerNetworkCallback(cellRequest, cellNetworkCallback);
+        waitForIdle();
 
         final ConnectivityService.NetworkRequestInfo[] nriOutput = mService.requestsSortedById();