Merge "Don't crash trying to disable lockdown VPN" into nyc-dev

2016-05-25 21:05:53 +00:00
parent c416433a9e dfd2fc6d06
commit a6269236a2
1 changed files with 1 additions and 0 deletions
--- a/src/com/android/settings/vpn2/ConfigDialogFragment.java
+++ b/src/com/android/settings/vpn2/ConfigDialogFragment.java
@@ -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());
            }