Merge "Fix ConnectivityServiceTest#testNetworkCallbackMaximum"

am: f7929f37b9

Change-Id: I1cbe45eb339903630675713d287e3375c7c98e62
This commit is contained in:
Hugo Benichi 2017-10-15 02:24:52 +00:00 • committed by android-build-merger
commit a5ea707a44

View file

@ -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 =