Merge "[MS33.2] Remove NetdService dependency" am: ee7ca130dc

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1935969

Change-Id: I35fb80fc8cfb90760be7b11f58c1a7746c417c44

tests/unit/java/com/android/server/net/NetworkStatsFactoryTest.java

@@ -34,6 +34,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
 import android.content.res.Resources;
+import android.net.INetd;
 import android.net.NetworkStats;
 import android.net.TrafficStats;
 import android.net.UnderlyingNetworkInfo;
@@ -54,6 +55,8 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -70,16 +73,19 @@ public class NetworkStatsFactoryTest extends NetworkStatsBaseTest {
 
     private File mTestProc;
     private NetworkStatsFactory mFactory;
+    @Mock
+    private INetd mNetd;
 
     @Before
     public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
         mTestProc = TestIoUtils.createTemporaryDirectory("proc");
 
         // The libandroid_servers which have the native method is not available to
         // applications. So in order to have a test support native library, the native code
         // related to networkStatsFactory is compiled to a minimal native library and loaded here.
         System.loadLibrary("networkstatsfactorytestjni");
-        mFactory = new NetworkStatsFactory(mTestProc, false);
+        mFactory = new NetworkStatsFactory(mTestProc, false, mNetd);
         mFactory.updateUnderlyingNetworkInfos(new UnderlyingNetworkInfo[0]);
     }