Merge "Fix flaky ConnectivityServiceTest#testNetworkFactoryUnregister" am: e9e871ef83

Change-Id: I93da1059a21adcf14f8c036c17963a07b1db964d
This commit is contained in:
Junyu Lai 2020-03-18 08:55:01 +00:00 • committed by Automerger Merge Worker
commit ef43214f03

View file

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