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

Merge "Don\'t crash trying to disable lockdown VPN" into nyc-dev am: a6269236a2

Browse Source 
am: cb5c925432

* commit 'cb5c925432f00d0fb555286f400cdd0c29683e25':
  Don't crash trying to disable lockdown VPN

Change-Id: I80f61b1a95d44f0be18577f37a709e4d15196d04
This commit is contained in:
Robin Lee
2016-05-25 21:28:34 +00:00
committed by android-build-merger
parent dd8ab483cb cb5c925432
commit 95c10c536b
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -176,6 +176,7 @@ public class ConfigDialogFragment extends DialogFragment implements
try {
LegacyVpnInfo connected = mService.getLegacyVpnInfo(UserHandle.myUserId());
if (connected != null && profile.key.equals(connected.key)) {
VpnUtils.clearLockdownVpn(getContext());
mService.prepareVpn(VpnConfig.LEGACY_VPN, VpnConfig.LEGACY_VPN,
UserHandle.myUserId());
}