Remove @IgnoreUpTo(Build.VERSION_CODES.Q) annotation
Mainline push is no longer pushed to Q devices. The annotation
is unnecessary now.
This commit also addresses some style check format issues.
Test: atest NetworkStacktTests
Change-Id: I95085a2de6e84979b35202de25bacaf6ca325c02
diff --git a/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java b/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java
index a741b10..6cdc82e 100644
--- a/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java
+++ b/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java
@@ -49,6 +49,7 @@
import static android.net.util.DataStallUtils.DEFAULT_DATA_STALL_EVALUATION_TYPES;
import static android.os.Build.VERSION_CODES.S_V2;
import static android.provider.DeviceConfig.NAMESPACE_CONNECTIVITY;
+
import static com.android.net.module.util.NetworkStackConstants.TEST_CAPTIVE_PORTAL_HTTPS_URL;
import static com.android.net.module.util.NetworkStackConstants.TEST_CAPTIVE_PORTAL_HTTP_URL;
import static com.android.net.module.util.NetworkStackConstants.TEST_URL_EXPIRATION_TIME;
@@ -63,11 +64,10 @@
import static com.android.networkstack.util.NetworkStackUtils.DNS_PROBE_PRIVATE_IP_NO_INTERNET_VERSION;
import static com.android.server.connectivity.NetworkMonitor.INITIAL_REEVALUATE_DELAY_MS;
import static com.android.server.connectivity.NetworkMonitor.extractCharset;
-import static java.lang.System.currentTimeMillis;
-import static java.util.Collections.singletonList;
-import static java.util.stream.Collectors.toList;
+
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertFalse;
+
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
@@ -96,6 +96,10 @@
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
+import static java.lang.System.currentTimeMillis;
+import static java.util.Collections.singletonList;
+import static java.util.stream.Collectors.toList;
+
import android.annotation.NonNull;
import android.annotation.SuppressLint;
import android.content.BroadcastReceiver;
@@ -1576,7 +1580,7 @@
HandlerUtils.waitForIdle(nm.getHandler(), HANDLER_TIMEOUT_MS);
}
- @Test @IgnoreUpTo(Build.VERSION_CODES.Q)
+ @Test
public void testIsCaptivePortal_CapportApiNotSupported() throws Exception {
// Test that on a R+ device, if NetworkStack was compiled without CaptivePortalData support
// (built against Q), NetworkMonitor behaves as expected.
