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

Browse Source 
am: a6269236a2

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

Change-Id: I71ecde2a45a26c775f5738c232b7d0da834af42a
This commit is contained in:
Robin Lee
2016-05-25 21:19:23 +00:00
committed by android-build-merger
parent 668c297603 a6269236a2
commit 74cc9772e9
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());
} }