diff options
| -rw-r--r-- | src/android/net/ip/IpClient.java | 10 | ||||
| -rw-r--r-- | tests/unit/Android.bp | 2 | ||||
| -rw-r--r-- | tests/unit/AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | tests/unit/src/android/net/ip/IpClientTest.java | 3 |
4 files changed, 13 insertions, 3 deletions
diff --git a/src/android/net/ip/IpClient.java b/src/android/net/ip/IpClient.java index 2079b2b..f3dcdc8 100644 --- a/src/android/net/ip/IpClient.java +++ b/src/android/net/ip/IpClient.java @@ -457,7 +457,7 @@ public class IpClient extends StateMachine { private final SharedLog mLog; private final LocalLog mConnectivityPacketLog; private final MessageHandlingLogger mMsgStateLogger; - private final IpConnectivityLog mMetricsLog = new IpConnectivityLog(); + private final IpConnectivityLog mMetricsLog; private final InterfaceController mInterfaceCtrl; // Ignore nonzero RDNSS option lifetimes below this value. 0 = disabled. @@ -536,6 +536,13 @@ public class IpClient extends StateMachine { return NetworkStackUtils.getDeviceConfigPropertyInt(NAMESPACE_CONNECTIVITY, name, defaultValue); } + + /** + * Get a IpConnectivityLog instance. + */ + public IpConnectivityLog getIpConnectivityLog() { + return new IpConnectivityLog(); + } } public IpClient(Context context, String ifName, IIpClientCallbacks callback, @@ -557,6 +564,7 @@ public class IpClient extends StateMachine { mInterfaceName = ifName; mClatInterfaceName = CLAT_PREFIX + ifName; mDependencies = deps; + mMetricsLog = deps.getIpConnectivityLog(); mShutdownLatch = new CountDownLatch(1); mCm = mContext.getSystemService(ConnectivityManager.class); mObserverRegistry = observerRegistry; diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp index 670b8e6..f6f4b86 100644 --- a/tests/unit/Android.bp +++ b/tests/unit/Android.bp @@ -16,7 +16,7 @@ java_defaults { name: "NetworkStackTestsDefaults", - certificate: "platform", + platform_apis: true, srcs: ["src/**/*.java", "src/**/*.kt"], resource_dirs: ["res"], static_libs: [ diff --git a/tests/unit/AndroidManifest.xml b/tests/unit/AndroidManifest.xml index 9c13784..e3b232b 100644 --- a/tests/unit/AndroidManifest.xml +++ b/tests/unit/AndroidManifest.xml @@ -27,7 +27,6 @@ <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" /> - <uses-permission android:name="android.permission.NETWORK_STACK" /> <application android:debuggable="true"> <uses-library android:name="android.test.runner" /> diff --git a/tests/unit/src/android/net/ip/IpClientTest.java b/tests/unit/src/android/net/ip/IpClientTest.java index 5fa5a6c..fe6dddb 100644 --- a/tests/unit/src/android/net/ip/IpClientTest.java +++ b/tests/unit/src/android/net/ip/IpClientTest.java @@ -49,6 +49,7 @@ import android.net.MacAddress; import android.net.NetworkStackIpMemoryStore; import android.net.RouteInfo; import android.net.ipmemorystore.NetworkAttributes; +import android.net.metrics.IpConnectivityLog; import android.net.shared.InitialConfiguration; import android.net.shared.ProvisioningConfiguration; import android.net.util.InterfaceParams; @@ -120,6 +121,7 @@ public class IpClientTest { @Mock private NetworkStackIpMemoryStore mIpMemoryStore; @Mock private IpMemoryStoreService mIpMemoryStoreService; @Mock private InterfaceParams mInterfaceParams; + @Mock private IpConnectivityLog mMetricsLog; private NetworkObserver mObserver; private InterfaceParams mIfParams; @@ -139,6 +141,7 @@ public class IpClientTest { when(mDependencies.getInterfaceParams(any())).thenReturn(mInterfaceParams); when(mDependencies.getIpMemoryStore(mContext, mNetworkStackServiceManager)) .thenReturn(mIpMemoryStore); + when(mDependencies.getIpConnectivityLog()).thenReturn(mMetricsLog); mIfParams = null; } |