From c5bad6f58c7414ecffde4d6a43228fba958ee4f8 Mon Sep 17 00:00:00 2001 From: Treehugger Robot Date: Tue, 9 Jun 2020 04:26:48 +0000 Subject: [PATCH] Reset vpn provision status The vpn status of cts app is updated to be consented in this tests which will impact the following test related to vpn. Thus, reset the status after finishing the test. Bug: 153760253 Test: atest CtsNetTestCasesLatestSdk Merged-In: I4856cfc7ddfd70125c513a4201132256704d1a66 Change-Id: I4856cfc7ddfd70125c513a4201132256704d1a66 --- tests/cts/net/src/android/net/cts/Ikev2VpnTest.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/cts/net/src/android/net/cts/Ikev2VpnTest.java b/tests/cts/net/src/android/net/cts/Ikev2VpnTest.java index dff2581118..81dfed507a 100644 --- a/tests/cts/net/src/android/net/cts/Ikev2VpnTest.java +++ b/tests/cts/net/src/android/net/cts/Ikev2VpnTest.java @@ -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 *