commit a6269236a24e00947efd3471f2901783413d56e5
author Robin Lee <rgl@google.com> Wed May 25 21:05:53 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 25 21:05:54 2016 +0000
tree 5736d0d80084242245f3391ffee130c9a814fcff
parent c416433a9ee55e2ac44fdb8e6c6d6ca4ed4cde62
parent dfd2fc6d06100822633fea5a34199f827bd99008

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

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());
             }