From ab871a00c7bf89aee8e72608e5df96003d65434d Mon Sep 17 00:00:00 2001 From: Pavel Grafov Date: Wed, 5 Dec 2018 11:25:51 +0000 Subject: [PATCH] Update to use new ConnectivityManager API. Bug: 77468593 Test: builds Change-Id: I614c20b9a1c6748614163766866bb59b15d794f1 --- src/com/android/settings/vpn2/AppDialogFragment.java | 3 ++- src/com/android/settings/vpn2/AppManagementFragment.java | 2 +- src/com/android/settings/vpn2/ConfigDialogFragment.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/vpn2/AppDialogFragment.java b/src/com/android/settings/vpn2/AppDialogFragment.java index 0d0022f74ea..2f9cd7a7101 100644 --- a/src/com/android/settings/vpn2/AppDialogFragment.java +++ b/src/com/android/settings/vpn2/AppDialogFragment.java @@ -164,7 +164,8 @@ public class AppDialogFragment extends InstrumentedDialogFragment implements App final int userId = getUserId(); try { if (mPackageInfo.packageName.equals(VpnUtils.getConnectedPackage(mService, userId))) { - mService.setAlwaysOnVpnPackage(userId, null, /* lockdownEnabled */ false); + mService.setAlwaysOnVpnPackage(userId, null, /* lockdownEnabled */ false, + /* lockdownWhitelist */ null); 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 1571216d53f..5f4644614c7 100644 --- a/src/com/android/settings/vpn2/AppManagementFragment.java +++ b/src/com/android/settings/vpn2/AppManagementFragment.java @@ -225,7 +225,7 @@ public class AppManagementFragment extends SettingsPreferenceFragment private boolean setAlwaysOnVpn(boolean isEnabled, boolean isLockdown) { return mConnectivityManager.setAlwaysOnVpnPackageForUser(mUserId, - isEnabled ? mPackageName : null, isLockdown); + isEnabled ? mPackageName : null, isLockdown, /* lockdownWhitelist */ null); } private void updateUI() { diff --git a/src/com/android/settings/vpn2/ConfigDialogFragment.java b/src/com/android/settings/vpn2/ConfigDialogFragment.java index ec927aec2f5..01b20f0b199 100644 --- a/src/com/android/settings/vpn2/ConfigDialogFragment.java +++ b/src/com/android/settings/vpn2/ConfigDialogFragment.java @@ -199,7 +199,7 @@ public class ConfigDialogFragment extends InstrumentedDialogFragment implements final ConnectivityManager conn = ConnectivityManager.from(mContext); conn.setAlwaysOnVpnPackageForUser(UserHandle.myUserId(), null, - /* lockdownEnabled */ false); + /* lockdownEnabled */ false, /* lockdownWhitelist */ null); VpnUtils.setLockdownVpn(mContext, profile.key); } else { // update only if lockdown vpn has been changed