Don't crash trying to disable lockdown VPN

Bug: 28624328 Change-Id: I2b726453da43feaf5f46d45679a702a52e6f4df0
2016-05-17 14:47:22 +01:00
parent a50a14a23a
commit dfd2fc6d06
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());
            }