commit a239c63f923cab0f767bf45a3cb31de69b8622f6
author Chalard Jean <jchalard@google.com> Fri Dec 11 02:32:56 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 11 02:32:56 2020 +0000
tree d1f903b16211ed94592a3a6b93fc837dba935ab1
parent c7dca725243e0f05f5fd036717662a1b9f3d8998
parent 787a9ad11640a64bc7343dafb6a2fc69e5a27171

Merge "Use the modern API for network agent"

tests/wifitests/src/com/android/server/wifi/WifiScoreReportTest.java

diff --git a/tests/wifitests/src/com/android/server/wifi/WifiScoreReportTest.java b/tests/wifitests/src/com/android/server/wifi/WifiScoreReportTest.java
index b85f223..9ab9f8e 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiScoreReportTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiScoreReportTest.java
@@ -43,8 +43,9 @@
 import android.net.LinkProperties;
 import android.net.Network;
 import android.net.NetworkAgent;
+import android.net.NetworkAgentConfig;
 import android.net.NetworkCapabilities;
-import android.net.NetworkInfo;
+import android.net.NetworkProvider;
 import android.net.wifi.IScoreUpdateObserver;
 import android.net.wifi.IWifiConnectedNetworkScorer;
 import android.net.wifi.WifiConfiguration;
@@ -129,8 +130,13 @@
     // NetworkAgent is abstract, so a subclass is necessary
     private static class TestNetworkAgent extends NetworkAgent {
         TestNetworkAgent(Context context) {
-            super(new TestLooper().getLooper(), context, "TestNetworkAgent",
-                    mock(NetworkInfo.class), new NetworkCapabilities(), new LinkProperties(), 0);
+            this(context, new TestLooper().getLooper());
+        }
+        private TestNetworkAgent(Context context, Looper looper) {
+            super(context, looper, "TestNetworkAgent", new NetworkCapabilities(),
+                    new LinkProperties(), 0, new NetworkAgentConfig.Builder().build(),
+                    new NetworkProvider(context, looper, "ScoreReportTest agent"));
+            register();
         }
         @Override protected void unwanted() { }
     }