diff --git a/services/core/java/com/android/server/connectivity/NetworkAgentInfo.java b/services/core/java/com/android/server/connectivity/NetworkAgentInfo.java index e96f4b0383..a4d7242086 100644 --- a/services/core/java/com/android/server/connectivity/NetworkAgentInfo.java +++ b/services/core/java/com/android/server/connectivity/NetworkAgentInfo.java @@ -278,6 +278,10 @@ public class NetworkAgentInfo implements Comparable { return mHandler; } + public Network network() { + return network; + } + // Functions for manipulating the requests satisfied by this network. // // These functions must only called on ConnectivityService's main thread. diff --git a/tests/net/java/com/android/server/ConnectivityServiceTest.java b/tests/net/java/com/android/server/ConnectivityServiceTest.java index 8816d43ef8..a814738038 100644 --- a/tests/net/java/com/android/server/ConnectivityServiceTest.java +++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java @@ -683,7 +683,8 @@ public class ConnectivityServiceTest extends AndroidTestCase { public WrappedNetworkMonitor(Context context, Handler handler, NetworkAgentInfo networkAgentInfo, NetworkRequest defaultRequest, IpConnectivityLog log) { - super(context, handler, networkAgentInfo, defaultRequest, log); + super(context, handler, networkAgentInfo, defaultRequest, log, + NetworkMonitor.NetworkMonitorSettings.DEFAULT); } @Override