Merge "Reset vpn provision status"
This commit is contained in:
@@ -56,6 +56,7 @@ import com.android.org.bouncycastle.x509.X509V1CertificateGenerator;
|
|||||||
import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo;
|
import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo;
|
||||||
import com.android.testutils.DevSdkIgnoreRunner;
|
import com.android.testutils.DevSdkIgnoreRunner;
|
||||||
|
|
||||||
|
import org.junit.After;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.junit.runner.RunWith;
|
import org.junit.runner.RunWith;
|
||||||
|
|
||||||
@@ -175,6 +176,12 @@ public class Ikev2VpnTest {
|
|||||||
mUserCertKey = generateRandomCertAndKeyPair();
|
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
|
* Sets the given appop using shell commands
|
||||||
*
|
*
|
||||||
|
|||||||
Reference in New Issue
Block a user