Snap for 6573866 from 2a3e73df0397a66a77ac1310c5df5754eb71b46e to rvc-release

Change-Id: I5d47b197b468a2705fd0497bd2cbd614096f0733
This commit is contained in:
android-build-team Robot
2020-06-10 01:08:45 +00:00

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
*