Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9450bbbb authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6837970 from c628e768 to sc-release 

Change-Id: Ic53f8fc8dc0c8132082b9d27535dc0df56204fa9
parents 4a2bdfe2 c628e768

tests/unit/src/com/android/networkstack/netlink/TcpSocketTrackerTest.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -207,7 +207,6 @@ public class TcpSocketTrackerTest { 
    private static final int TEST_NETID2_FWMARK = 0x1A85;

    private static final int TEST_NETID2_FWMARK = 0x1A85;

    private static final int NETID_MASK = 0xffff;

    private static final int NETID_MASK = 0xffff;

    @Mock private TcpSocketTracker.Dependencies mDependencies;

    @Mock private TcpSocketTracker.Dependencies mDependencies;

    @Mock private FileDescriptor mMockFd;

    @Mock private INetd mNetd;

    @Mock private INetd mNetd;

    private final Network mNetwork = new Network(TEST_NETID1);

    private final Network mNetwork = new Network(TEST_NETID1);

    private final Network mOtherNetwork = new Network(TEST_NETID2);

    private final Network mOtherNetwork = new Network(TEST_NETID2);
@@ -226,7 +225,7 @@ public class TcpSocketTrackerTest { 
                Log.setWtfHandler((tag, what, system) -> Log.e(tag, what.getMessage(), what));

                Log.setWtfHandler((tag, what, system) -> Log.e(tag, what.getMessage(), what));

        when(mDependencies.getNetd()).thenReturn(mNetd);

        when(mDependencies.getNetd()).thenReturn(mNetd);

        when(mDependencies.isTcpInfoParsingSupported()).thenReturn(true);

        when(mDependencies.isTcpInfoParsingSupported()).thenReturn(true);

        when(mDependencies.connectToKernel()).thenReturn(mMockFd);

        when(mDependencies.connectToKernel()).thenReturn(new FileDescriptor());

        when(mDependencies.getDeviceConfigPropertyInt(

        when(mDependencies.getDeviceConfigPropertyInt(

                eq(NAMESPACE_CONNECTIVITY),

                eq(NAMESPACE_CONNECTIVITY),

                eq(CONFIG_TCP_PACKETS_FAIL_PERCENTAGE),

                eq(CONFIG_TCP_PACKETS_FAIL_PERCENTAGE),