commit eb4e92c45dc94d01e235ddd1a12e1e26fc841226
author Mark Chien <markchien@google.com> Wed Aug 16 02:17:58 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 16 02:17:58 2023 +0000
tree 7e9c5b8b0c4a5bbcbc6d8287769a36b02954c5b6
parent 290530b59196bedce7d0731b07e1ce93400de157
parent fa6ab01471ae4e9426570e71dce56b7738cba893

Merge "Restore presubmit of testSetOemNetworkPreferenceForTestOnlyPref" into main

tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java

diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
index 74316b5..bce08df 100644
--- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
+++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
@@ -2744,7 +2744,6 @@
      */
     @AppModeFull(reason = "Instant apps cannot create test networks")
     @Test
-    @SkipMainlinePresubmit(reason = "Out of SLO flakiness")
     public void testSetOemNetworkPreferenceForTestOnlyPref() throws Exception {
         // Cannot use @IgnoreUpTo(Build.VERSION_CODES.R) because this test also requires API 31
         // shims, and @IgnoreUpTo does not check that.