Merge "Fix race when starting NetworkMonitor" am: ca5b44477a am: 9e85030e71

am: bf761cce3e Change-Id: I595ecdbf0b8e91fec4287c3476239a1e6c9c80a7
2019-03-31 21:35:25 -07:00
parent 511b9e7be1 bf761cce3e
commit ede73bb437
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());