Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev
diff --git a/src/com/android/settings/vpn2/AppDialogFragment.java b/src/com/android/settings/vpn2/AppDialogFragment.java
index 004ad80..097001a 100644
--- a/src/com/android/settings/vpn2/AppDialogFragment.java
+++ b/src/com/android/settings/vpn2/AppDialogFragment.java
@@ -138,7 +138,7 @@
final int userId = UserHandle.getUserId(mPackageInfo.applicationInfo.uid);
try {
if (mPackageInfo.packageName.equals(getConnectedPackage(mService, userId))) {
- mService.setAlwaysOnVpnPackage(userId, null);
+ mService.setAlwaysOnVpnPackage(userId, null, /* lockdownEnabled */ false);
mService.prepareVpn(mPackageInfo.packageName, VpnConfig.LEGACY_VPN, userId);
}
} catch (RemoteException e) {
diff --git a/src/com/android/settings/vpn2/AppManagementFragment.java b/src/com/android/settings/vpn2/AppManagementFragment.java
index f8e30f9..8ad64d4 100644
--- a/src/com/android/settings/vpn2/AppManagementFragment.java
+++ b/src/com/android/settings/vpn2/AppManagementFragment.java
@@ -176,7 +176,8 @@
if (mUserId == UserHandle.USER_SYSTEM) {
VpnUtils.clearLockdownVpn(getContext());
}
- mConnectivityManager.setAlwaysOnVpnPackageForUser(mUserId, isEnabled ? mPackageName : null);
+ mConnectivityManager.setAlwaysOnVpnPackageForUser(mUserId, isEnabled ? mPackageName : null,
+ /* lockdownEnabled */ false);
if (isEnabled && !isVpnAlwaysOn()) {
CannotConnectFragment.show(this, mVpnLabel);
}
diff --git a/src/com/android/settings/vpn2/ConfigDialogFragment.java b/src/com/android/settings/vpn2/ConfigDialogFragment.java
index 5e4a7d9..0dbaa9a 100644
--- a/src/com/android/settings/vpn2/ConfigDialogFragment.java
+++ b/src/com/android/settings/vpn2/ConfigDialogFragment.java
@@ -153,7 +153,8 @@
}
final ConnectivityManager conn = ConnectivityManager.from(getActivity());
- conn.setAlwaysOnVpnPackageForUser(UserHandle.myUserId(), null);
+ conn.setAlwaysOnVpnPackageForUser(UserHandle.myUserId(), null,
+ /* lockdownEnabled */ false);
VpnUtils.setLockdownVpn(getContext(), profile.key);
} else {
// update only if lockdown vpn has been changed