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

Commit 3acdaac1 authored by Erik Kline's avatar Erik Kline Committed by Android Git Automerger
Browse files

am 38fc400a: am 453d52b6: am 51d71aa2: am 583deb52: Merge "Unconfigure the... 

am 38fc400a: am 453d52b6: am 51d71aa2: am 583deb52: Merge "Unconfigure the lockdown VPN if the user forgets its profile." into mnc-dr-dev

* commit '38fc400a':
  Unconfigure the lockdown VPN if the user forgets its profile.
parents 13531ed9 38fc400a

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

+14 −1
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.settings.vpn2;



import java.util.Arrays;



import android.app.Dialog;

import android.app.DialogFragment;

import android.content.Context;
@@ -123,7 +125,18 @@ public class ConfigDialogFragment extends DialogFragment implements 
            disconnect(profile);



            // Delete from KeyStore

            KeyStore.getInstance().delete(Credentials.VPN + profile.key, KeyStore.UID_SELF);

            KeyStore keyStore = KeyStore.getInstance();

            keyStore.delete(Credentials.VPN + profile.key, KeyStore.UID_SELF);



            // If this was the current lockdown VPN, clear it.

            if (Arrays.equals(profile.key.getBytes(), keyStore.get(Credentials.LOCKDOWN_VPN))) {

                keyStore.delete(Credentials.LOCKDOWN_VPN);

                try {

                    mService.updateLockdownVpn();

                } catch (RemoteException e) {

                    Log.e(TAG, "Failed to clear lockdown VPN configuration");

                }

            }

        }

        dismiss();

    }