Snap for 8756258 from fac4f05be7032c5983b427ab0d5edba3fce70b4b to tm-release
Change-Id: I7350a7eabb6915f9db4c3b0ac90ddb207fcb6801
diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
index c3e3aad..0e9c16d 100644
--- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
+++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
@@ -3418,6 +3418,7 @@
}
@Test @IgnoreUpTo(SC_V2)
+ @AppModeFull(reason = "Socket cannot bind in instant app mode")
public void testFirewallBlocking() {
// Following tests affect the actual state of networking on the device after the test.
// This might cause unexpected behaviour of the device. So, we skip them for now.
diff --git a/tests/unit/java/android/net/NetworkStatsRecorderTest.java b/tests/unit/java/android/net/NetworkStatsRecorderTest.java
index 7797380..fad11a3 100644
--- a/tests/unit/java/android/net/NetworkStatsRecorderTest.java
+++ b/tests/unit/java/android/net/NetworkStatsRecorderTest.java
@@ -39,7 +39,6 @@
import com.android.testutils.DevSdkIgnoreRunner;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -68,7 +67,6 @@
HOUR_IN_MILLIS, false /* includeTags */, wipeOnError);
}
- @Ignore // TODO(b/234099453): re-enable as soon as prebuilts are updated.
@Test
public void testWipeOnError() throws Exception {
final FileRotator rotator = mock(FileRotator.class);
