From abf0c1d1e68e1e92d4c3a566ff7744e0c7a0c3a0 Mon Sep 17 00:00:00 2001 From: Chiachang Wang Date: Thu, 4 Jun 2020 12:52:31 +0800 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 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 5cc0cb4128..2fa51233d1 100644 --- a/tests/cts/net/src/android/net/cts/Ikev2VpnTest.java +++ b/tests/cts/net/src/android/net/cts/Ikev2VpnTest.java @@ -54,6 +54,7 @@ import androidx.test.runner.AndroidJUnit4; import com.android.internal.util.HexDump; import com.android.org.bouncycastle.x509.X509V1CertificateGenerator; +import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; @@ -172,6 +173,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 *