Merge "Fix Error Prone errors"

3 files changed, 5 insertions, 0 deletions

diff --git a/tests/integration/src/android/net/ip/IpClientIntegrationTest.java b/tests/integration/src/android/net/ip/IpClientIntegrationTest.java
index afd5929..5090c55 100644
--- a/tests/integration/src/android/net/ip/IpClientIntegrationTest.java
+++ b/tests/integration/src/android/net/ip/IpClientIntegrationTest.java
@@ -1179,6 +1179,7 @@ public class IpClientIntegrationTest {
                 true /* shouldAbortPreconnection */);
     }
 
+    @Test
     public void testDhcpDecline_conflictByArpReply() throws Exception {
         doIpAddressConflictDetectionTest(true /* causeIpAddressConflict */,
                 false /* isDhcpRapidCommitEnabled */, true /* isDhcpIpConflictDetectEnabled */,
diff --git a/tests/unit/src/android/net/ip/IpClientTest.java b/tests/unit/src/android/net/ip/IpClientTest.java
index b3e652e..4be5442 100644
--- a/tests/unit/src/android/net/ip/IpClientTest.java
+++ b/tests/unit/src/android/net/ip/IpClientTest.java
@@ -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);
diff --git a/tests/unit/src/com/android/server/connectivity/ipmemorystore/IpMemoryStoreServiceTest.java b/tests/unit/src/com/android/server/connectivity/ipmemorystore/IpMemoryStoreServiceTest.java
index 4e34969..9ff3475 100644
--- a/tests/unit/src/com/android/server/connectivity/ipmemorystore/IpMemoryStoreServiceTest.java
+++ b/tests/unit/src/com/android/server/connectivity/ipmemorystore/IpMemoryStoreServiceTest.java
@@ -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();