diff options
| author | 2021-01-15 14:04:42 +0000 | |
|---|---|---|
| committer | 2021-01-15 14:04:42 +0000 | |
| commit | 1ed75a5961c67adbb807ad5bc84579fe2bbb9910 (patch) | |
| tree | ce7b43ff4da17cee80423df97290c9fe225bcbfc | |
| parent | 27eb3b9a8cbd7440a16beba125889a79f96d09c9 (diff) | |
| parent | 59afc1a24bab00343718ea08d899f8fc6195af09 (diff) | |
Merge "Waiting for idle in test" am: a5ff3b537c am: 7c73758907 am: 59afc1a24b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550420
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib7ef4eedc0982640b4923885b2deeaefc8081db9
| -rw-r--r-- | tests/net/java/com/android/server/ConnectivityServiceTest.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/net/java/com/android/server/ConnectivityServiceTest.java b/tests/net/java/com/android/server/ConnectivityServiceTest.java index 0285dd0b85a5..a836e81fdb8c 100644 --- a/tests/net/java/com/android/server/ConnectivityServiceTest.java +++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java @@ -8429,6 +8429,7 @@ public class ConnectivityServiceTest { mCm.registerNetworkCallback(genericRequest, genericNetworkCallback); mCm.registerNetworkCallback(wifiRequest, wifiNetworkCallback); mCm.registerNetworkCallback(cellRequest, cellNetworkCallback); + waitForIdle(); final ConnectivityService.NetworkRequestInfo[] nriOutput = mService.requestsSortedById(); |