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

Commit 075c6289 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Fix Error Prone errors" am: 3651e21c am: 3e304cf3 

Change-Id: I455b906c96411f09350b73d228e323102ac8d951
parents ad674f17 3e304cf3

tests/integration/src/android/net/ip/IpClientIntegrationTest.java

+1 −0
Original line number Diff line number Diff line
@@ -1179,6 +1179,7 @@ public class IpClientIntegrationTest { 
                true /* shouldAbortPreconnection */);

    }



    @Test

    public void testDhcpDecline_conflictByArpReply() throws Exception {

        doIpAddressConflictDetectionTest(true /* causeIpAddressConflict */,

                false /* isDhcpRapidCommitEnabled */, true /* isDhcpIpConflictDetectEnabled */,

tests/unit/src/android/net/ip/IpClientTest.java

+1 −0
Original line number Diff line number Diff line
@@ -349,6 +349,7 @@ public class IpClientTest { 
        doDefaultDualStackProvisioningConfigurationTest(false /* avoidBadWifi */);

    }



    @Test

    public void testProvisioningWithInitialConfiguration() throws Exception {

        final String iface = TEST_IFNAME;

        final IpClient ipc = makeIpClient(iface);

tests/unit/src/com/android/server/connectivity/ipmemorystore/IpMemoryStoreServiceTest.java

+3 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ import libcore.io.Streams; 


import org.junit.After;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;
@@ -769,6 +770,8 @@ public class IpMemoryStoreServiceTest { 
                        })));

    }



    @Test

    @Ignore

    public void testTasksAreSerial() {

        final long sleepTimeMs = 1000;

        final long startTime = System.currentTimeMillis();