Merge "Fix flaky ConnectivityServiceTest#testNetworkFactoryUnregister" am: cc227f1df5 am: 8262d74f5c

Change-Id: Ia9c20c7ce560a06c393a1010e8a8220b67ce753e
This commit is contained in:
Junyu Lai
2020-03-18 09:02:22 +00:00
committed by Automerger Merge Worker

View File

@@ -2465,8 +2465,8 @@ public class ConnectivityServiceTest {
final MockNetworkFactory testFactory = new MockNetworkFactory(handlerThread.getLooper(), final MockNetworkFactory testFactory = new MockNetworkFactory(handlerThread.getLooper(),
mServiceContext, "testFactory", filter); mServiceContext, "testFactory", filter);
// Register the factory and don't be surprised when the default request arrives. // Register the factory and don't be surprised when the default request arrives.
testFactory.register();
testFactory.expectAddRequestsWithScores(0); testFactory.expectAddRequestsWithScores(0);
testFactory.register();
testFactory.waitForNetworkRequests(1); testFactory.waitForNetworkRequests(1);
testFactory.setScoreFilter(42); testFactory.setScoreFilter(42);