Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74cc9772 authored by Robin Lee's avatar Robin Lee Committed by android-build-merger
Browse files

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

am: a6269236

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

Change-Id: I71ecde2a45a26c775f5738c232b7d0da834af42a
parents 668c2976 a6269236

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

+1 −0
Original line number Diff line number Diff line
@@ -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());

            }