summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorRobin Lee <rgl@google.com>2015-05-12 18:35:37 +0100
committerRobin Lee <rgl@google.com>2015-05-18 22:55:15 +0100
commit01b35bcae307907bd8aaaa9cf23fa50f70e5f491 (patch)
tree5b0dd918f5aa299b7bcb1ec7bde7f3bc6063843f /tests
parentfd210786eab8c4aacbbb3aad5a206c57a732d2dc (diff)
downloadpackages_apps_Settings-01b35bcae307907bd8aaaa9cf23fa50f70e5f491.zip
packages_apps_Settings-01b35bcae307907bd8aaaa9cf23fa50f70e5f491.tar.gz
packages_apps_Settings-01b35bcae307907bd8aaaa9cf23fa50f70e5f491.tar.bz2
VPN: UI for forgetting disconnected VPNs
Made possible by expanded internal VPN APIs. Bug: 20872408 Bug: 20692490 Bug: 20747154 Change-Id: Idc87084a130afa18b27c85cc9d4b5033dcedaabe
Diffstat (limited to 'tests')
-rw-r--r--tests/src/com/android/settings/vpn2/VpnTests.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/src/com/android/settings/vpn2/VpnTests.java b/tests/src/com/android/settings/vpn2/VpnTests.java
index 8300534..26cfc9b 100644
--- a/tests/src/com/android/settings/vpn2/VpnTests.java
+++ b/tests/src/com/android/settings/vpn2/VpnTests.java
@@ -22,6 +22,7 @@ import android.os.Bundle;
import android.os.Environment;
import android.os.RemoteException;
import android.os.ServiceManager;
+import android.os.UserHandle;
import android.security.Credentials;
import android.security.KeyStore;
import android.security.NetworkSecurityPolicy;
@@ -214,7 +215,7 @@ public class VpnTests extends InstrumentationTestCase {
*/
private void disconnect() throws Exception {
try {
- mService.prepareVpn(VpnConfig.LEGACY_VPN, VpnConfig.LEGACY_VPN);
+ mService.prepareVpn(VpnConfig.LEGACY_VPN, VpnConfig.LEGACY_VPN, UserHandle.myUserId());
} catch (RemoteException e) {
Log.e(TAG, String.format("disconnect VPN exception: %s", e.toString()));
}