Merge "Fix race when starting NetworkMonitor"

2019-04-01 03:54:03 +00:00
parent 293ffaa081 ca33d197d9
commit ef8485cc65
3 changed files with 32 additions and 20 deletions
--- a/tests/net/java/com/android/server/ConnectivityServiceTest.java
+++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java
@@ -499,7 +499,7 @@ public class ConnectivityServiceTest {
            };

            try {
-                doAnswer(validateAnswer).when(mNetworkMonitor).notifyNetworkConnected();
+                doAnswer(validateAnswer).when(mNetworkMonitor).notifyNetworkConnected(any(), any());
                doAnswer(validateAnswer).when(mNetworkMonitor).forceReevaluation(anyInt());
            } catch (RemoteException e) {
                fail(e.getMessage());