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 am: 74cc9772e9

Browse Source 
am: 2e98acf1ba

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

Change-Id: Ic1947363f51c9769415602752a650206a60b32a6
This commit is contained in:
Robin Lee
2016-05-25 21:37:47 +00:00
committed by android-build-merger
parent 33658f63af 2e98acf1ba
commit 558123bc38
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 { try {
LegacyVpnInfo connected = mService.getLegacyVpnInfo(UserHandle.myUserId()); LegacyVpnInfo connected = mService.getLegacyVpnInfo(UserHandle.myUserId());
if (connected != null && profile.key.equals(connected.key)) { if (connected != null && profile.key.equals(connected.key)) {
VpnUtils.clearLockdownVpn(getContext());
mService.prepareVpn(VpnConfig.LEGACY_VPN, VpnConfig.LEGACY_VPN, mService.prepareVpn(VpnConfig.LEGACY_VPN, VpnConfig.LEGACY_VPN,
UserHandle.myUserId()); UserHandle.myUserId());
} }