commit c63627c23cafa1cd8df1ad4ebeb8e998014d8b05
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jun 10 15:21:05 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 10 15:21:05 2020 +0000
tree 1ab9a8e56ed75fb8c44f53dccc633ed0feb2b4da
parent c5bad6f58c7414ecffde4d6a43228fba958ee4f8
parent bac55b7eeba056ce614a292a4e1c3b121b77a77a

Merge "Enlarge the onAvailable callback timeout to 30 seconds" into rvc-dev

tests/cts/net/src/android/net/cts/Ikev2VpnTest.java

diff --git a/tests/cts/net/src/android/net/cts/Ikev2VpnTest.java b/tests/cts/net/src/android/net/cts/Ikev2VpnTest.java
index dff2581..81dfed5 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.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 @@
         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
      *