commit 74cc9772e9769b8c6a8cd6a6bb36cc8cfd5efb74
author Robin Lee <rgl@google.com> Wed May 25 21:19:23 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 25 21:19:23 2016 +0000
tree 95eae833295950855640319ecbc9598411a28a4f
parent 668c297603c6ae20225717741d90d06e819216c0
parent a6269236a24e00947efd3471f2901783413d56e5

Merge "Don\'t crash trying to disable lockdown VPN" into nyc-dev
am: a6269236a2

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

Change-Id: I71ecde2a45a26c775f5738c232b7d0da834af42a

src/com/android/settings/vpn2/ConfigDialogFragment.java

diff --git a/src/com/android/settings/vpn2/ConfigDialogFragment.java b/src/com/android/settings/vpn2/ConfigDialogFragment.java
index 0dbaa9a..788b9a9 100644
--- a/src/com/android/settings/vpn2/ConfigDialogFragment.java
+++ b/src/com/android/settings/vpn2/ConfigDialogFragment.java
@@ -176,6 +176,7 @@
         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());
             }