PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update to use new ConnectivityManager API."

Browse Source 
am: 161f5ec3e9

Change-Id: I14a198bf8c95501473ac963ee6e00331e09daa76
This commit is contained in:
Pavel Grafov
2019-01-24 09:50:37 -08:00
committed by android-build-merger
parent 0d8ea3bfce 161f5ec3e9
commit 525b0dbc17
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/vpn2/AppDialogFragment.java
View File

@@ -163,7 +163,8 @@ public class AppDialogFragment extends InstrumentedDialogFragment implements App
final int userId = getUserId(); final int userId = getUserId();
try { try {
if (mPackageInfo.packageName.equals(VpnUtils.getConnectedPackage(mService, userId))) { 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); mService.prepareVpn(mPackageInfo.packageName, VpnConfig.LEGACY_VPN, userId);
} }
} catch (RemoteException e) { } catch (RemoteException e) {

2
src/com/android/settings/vpn2/AppManagementFragment.java
View File

@@ -224,7 +224,7 @@ public class AppManagementFragment extends SettingsPreferenceFragment
private boolean setAlwaysOnVpn(boolean isEnabled, boolean isLockdown) { private boolean setAlwaysOnVpn(boolean isEnabled, boolean isLockdown) {
return mConnectivityManager.setAlwaysOnVpnPackageForUser(mUserId, return mConnectivityManager.setAlwaysOnVpnPackageForUser(mUserId,
isEnabled ? mPackageName : null, isLockdown); isEnabled ? mPackageName : null, isLockdown, /* lockdownWhitelist */ null);
} }
private void updateUI() { private void updateUI() {

2
src/com/android/settings/vpn2/ConfigDialogFragment.java
View File

@@ -200,7 +200,7 @@ public class ConfigDialogFragment extends InstrumentedDialogFragment implements
final ConnectivityManager conn = ConnectivityManager.from(mContext); final ConnectivityManager conn = ConnectivityManager.from(mContext);
conn.setAlwaysOnVpnPackageForUser(UserHandle.myUserId(), null, conn.setAlwaysOnVpnPackageForUser(UserHandle.myUserId(), null,
/* lockdownEnabled */ false); /* lockdownEnabled */ false, /* lockdownWhitelist */ null);
VpnUtils.setLockdownVpn(mContext, profile.key); VpnUtils.setLockdownVpn(mContext, profile.key);
} else { } else {
// update only if lockdown vpn has been changed // update only if lockdown vpn has been changed