Clear VPN after Clear credentials if VPN is being established

1. There is no way to disconnect VPN after 'Clear credentials'
without removing whole Internet connection because VPN profile to
disconnect is removed when Clear credentials.

2. This commit checks whether VPN is being established or not when
Clear credentials and disconnect VPN if VPN is being established.
Lastly, this shows a toast message to inform VPN disconnected.

Test: manual - took a photo

Signed-off-by : Sungmin Lee <insight.lee@lge.com>
Bug: 29093779

Change-Id: Id5ea01c8731b3b0fca2a31d9d84e8c103952b377
This commit is contained in:
insight.lee
2017-01-17 08:27:01 +09:00
parent ab9e269d06
commit 03159e4c85
4 changed files with 39 additions and 3 deletions

View File

@@ -176,9 +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());
VpnUtils.disconnectLegacyVpn(getContext());
}
} catch (RemoteException e) {
Log.e(TAG, "Failed to disconnect", e);