[automerger skipped] Merge "Remove dependency on kotlin-reflect" into rvc-dev am: 888919fce1 am: f61ff3be56 -s ours
am skip reason: Change-Id I6691a07ef8d6c63e68cb78813a5e3e499ef897df with SHA-1 eef04c75ce is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11702977
Change-Id: I097a7e8b1b2966d213455ae5394c7a9e585fd534
diff --git a/tests/cts/net/src/android/net/cts/Ikev2VpnTest.java b/tests/cts/net/src/android/net/cts/Ikev2VpnTest.java
index 5cc0cb4..dff2581 100644
--- a/tests/cts/net/src/android/net/cts/Ikev2VpnTest.java
+++ b/tests/cts/net/src/android/net/cts/Ikev2VpnTest.java
@@ -46,13 +46,15 @@
import android.net.TestNetworkManager;
import android.net.VpnManager;
import android.net.cts.util.CtsNetUtils;
+import android.os.Build;
import android.platform.test.annotations.AppModeFull;
import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
import com.android.internal.util.HexDump;
import com.android.org.bouncycastle.x509.X509V1CertificateGenerator;
+import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo;
+import com.android.testutils.DevSdkIgnoreRunner;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -70,7 +72,8 @@
import javax.security.auth.x500.X500Principal;
-@RunWith(AndroidJUnit4.class)
+@RunWith(DevSdkIgnoreRunner.class)
+@IgnoreUpTo(Build.VERSION_CODES.Q)
@AppModeFull(reason = "Appops state changes disallowed for instant apps (OP_ACTIVATE_PLATFORM_VPN)")
public class Ikev2VpnTest {
private static final String TAG = Ikev2VpnTest.class.getSimpleName();