Merge "Set extraInfo on cellular TestNetworkAgents."

2021-03-11 03:31:49 +00:00
parent a0d00e1964 8affa9ee66
commit 97f7b04b45
2 changed files with 24 additions and 11 deletions
--- a/tests/net/java/com/android/server/ConnectivityServiceTest.java
+++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java
@@ -718,7 +718,7 @@ public class ConnectivityServiceTest {

        @Override
        protected InstrumentedNetworkAgent makeNetworkAgent(LinkProperties linkProperties,
-                final int type, final String typeName) throws Exception {
+                NetworkAgentConfig nac) throws Exception {
            mNetworkMonitor = mock(INetworkMonitor.class);

            final Answer validateAnswer = inv -> {
@@ -737,8 +737,8 @@ public class ConnectivityServiceTest {
                    any() /* name */,
                    nmCbCaptor.capture());

-            final InstrumentedNetworkAgent na = new InstrumentedNetworkAgent(this, linkProperties,
-                    type, typeName) {
+            final InstrumentedNetworkAgent na =
+                    new InstrumentedNetworkAgent(this, linkProperties, nac) {
                @Override
                public void networkStatus(int status, String redirectUrl) {
                    mRedirectUrl = redirectUrl;