Mock IpConnectivityLog in IpClientTest

IpConnectivityLog which is used to send metrics need NETWORK_STACK
permission. Mock IpConnectivityLog to avoid sending metrics from
tests. Also remove platform cert from the network stack unit test
because it is not necessary for any signature permission anymore.

Bug: 156866746
Test: NetworkStackNextTests, NetworkStackCoverageTests, TetheringTests,
TetheringCoverageTests

Change-Id: Ibff052b30e000de3c5a08d7265c7642d67d9b0d0

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;