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

Revert "Update to use new ConnectivityManager API."

Browse Source 
This reverts commit 9a9f6f313b.

Reason for revert: broke pi-dev-plus-aosp

Change-Id: Ia0ff7cdf77b4edf3bdf5e4c54376b730df48373e
This commit is contained in:
Dan Albert
2019-01-24 21:06:02 +00:00
parent 9a9f6f313b
commit 6e91f68ae4
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -163,8 +163,7 @@ 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, /* lockdownWhitelist */ null); isEnabled ? mPackageName : null, isLockdown);
} }
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, /* lockdownWhitelist */ null); /* lockdownEnabled */ false);
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