Merge "Reset vpn provision status" am: 5469352727 am: 43f52399ac

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

Change-Id: Ie8b6133774c1539d6c733f7c928957592f304404
This commit is contained in:
Treehugger Robot
2020-06-09 04:26:48 +00:00
committed by Automerger Merge Worker

View File

@@ -56,6 +56,7 @@ import com.android.org.bouncycastle.x509.X509V1CertificateGenerator;
import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo;
import com.android.testutils.DevSdkIgnoreRunner;
import org.junit.After;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -175,6 +176,12 @@ public class Ikev2VpnTest {
mUserCertKey = generateRandomCertAndKeyPair();
}
@After
public void tearDown() {
setAppop(AppOpsManager.OP_ACTIVATE_VPN, false);
setAppop(AppOpsManager.OP_ACTIVATE_PLATFORM_VPN, false);
}
/**
* Sets the given appop using shell commands
*