Merge "Skip Ikev2VpnTest on Q" am: bdfc18bc1e am: 247548cc30

Original change: https://android-review.googlesource.com/c/platform/cts/+/1322414

Change-Id: Ibaca59cea43f48392c280b06a644f109e2f4bb99
This commit is contained in:
Remi NGUYEN VAN
2020-06-03 00:38:34 +00:00
committed by Automerger Merge Worker

View File

@@ -46,13 +46,15 @@ import android.net.TestNetworkInterface;
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 java.util.concurrent.TimeUnit;
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();