Snap for 8756523 from 2f5299fafaa3db1c531ff19417c1790cdd5905ed to tm-d1-release
Change-Id: I1e975178a9b0e72a92a82bb18579caf6aa200a09
diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
index c00bbf4..0cd3490 100644
--- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
+++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
@@ -3420,6 +3420,7 @@
@Ignore("TODO: temporarily ignore tests until prebuilts are updated")
@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);