From dfd2fc6d06100822633fea5a34199f827bd99008 Mon Sep 17 00:00:00 2001
From: Robin Lee <rgl@google.com>
Date: Tue, 17 May 2016 14:47:22 +0100
Subject: [PATCH] Don't crash trying to disable lockdown VPN

Bug: 28624328
Change-Id: I2b726453da43feaf5f46d45679a702a52e6f4df0
---
 src/com/android/settings/vpn2/ConfigDialogFragment.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/com/android/settings/vpn2/ConfigDialogFragment.java b/src/com/android/settings/vpn2/ConfigDialogFragment.java
index 0dbaa9a347..788b9a9726 100644
--- 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());
             }
-- 
2.11.0