Merge "Mock IpConnectivityLog in IpClientTest" into rvc-dev am: 7bfc08f95f

Change-Id: I51ebbe9555926dcc4afd8ea51bfadfc89472a335

1 files changed, 9 insertions, 1 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;