Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on" into nyc-dev

Browse Source
This commit is contained in:
Robin Lee
2016-06-06 10:10:54 +00:00
committed by Android (Google) Code Review
parent bc02a3901d b04a5eab84
commit 265f4113ee
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -5202,6 +5202,15 @@ public class ConnectivityService extends IConnectivityManager.Stub
} }
if (!mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_VPN)) { if (!mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_VPN)) {
// Remove always-on package
synchronized (mVpns) {
final String alwaysOnPackage = getAlwaysOnVpnPackage(userId);
if (alwaysOnPackage != null) {
setAlwaysOnVpnPackage(userId, null, false);
setVpnPackageAuthorization(alwaysOnPackage, userId, false);
}
}
// Turn VPN off // Turn VPN off
VpnConfig vpnConfig = getVpnConfig(userId); VpnConfig vpnConfig = getVpnConfig(userId);
if (vpnConfig != null) { if (vpnConfig != null) {
@@ -5212,7 +5221,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
// in the future without user intervention. // in the future without user intervention.
setVpnPackageAuthorization(vpnConfig.user, userId, false); setVpnPackageAuthorization(vpnConfig.user, userId, false);
prepareVpn(vpnConfig.user, VpnConfig.LEGACY_VPN, userId); prepareVpn(null, VpnConfig.LEGACY_VPN, userId);
} }
} }
} }