summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Hugo Benichi <hugobenichi@google.com> 2017-10-13 01:44:36 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2017-10-13 01:44:36 +0000
commitd0983285857f9107b9306a57f3b500672d76c7d9 (patch)
tree8318abcc5ab446b939df914ef13621d29e41307e
parent42156f3e56617d3867020d0a81fe24f48723efc1 (diff)
parent1e5039e0e47eaca3bbe5452f8328c26756468e46 (diff)
Merge "Fix ConnectivityServiceTest#testNetworkCallbackMaximum"
-rw-r--r--tests/net/java/com/android/server/ConnectivityServiceTest.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/net/java/com/android/server/ConnectivityServiceTest.java b/tests/net/java/com/android/server/ConnectivityServiceTest.java
index d9586c2b31c5..c2cb66d5e60a 100644
--- a/tests/net/java/com/android/server/ConnectivityServiceTest.java
+++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java
@@ -3296,12 +3296,14 @@ public class ConnectivityServiceTest {
mCm.requestNetwork(networkRequest, networkCallback);
mCm.unregisterNetworkCallback(networkCallback);
}
+ waitForIdle();
for (int i = 0; i < MAX_REQUESTS; i++) {
NetworkCallback networkCallback = new NetworkCallback();
mCm.registerNetworkCallback(networkRequest, networkCallback);
mCm.unregisterNetworkCallback(networkCallback);
}
+ waitForIdle();
for (int i = 0; i < MAX_REQUESTS; i++) {
PendingIntent pendingIntent =
@@ -3309,6 +3311,7 @@ public class ConnectivityServiceTest {
mCm.requestNetwork(networkRequest, pendingIntent);
mCm.unregisterNetworkCallback(pendingIntent);
}
+ waitForIdle();
for (int i = 0; i < MAX_REQUESTS; i++) {
PendingIntent pendingIntent =