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:
@@ -47,6 +47,7 @@ import android.widget.Toast;
|
||||
import com.android.internal.widget.LockPatternUtils;
|
||||
import com.android.org.bouncycastle.asn1.ASN1InputStream;
|
||||
import com.android.org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
|
||||
import com.android.settings.vpn2.VpnUtils;
|
||||
|
||||
import sun.security.util.ObjectIdentifier;
|
||||
import sun.security.x509.AlgorithmId;
|
||||
@@ -361,6 +362,7 @@ public final class CredentialStorage extends Activity {
|
||||
if (success) {
|
||||
Toast.makeText(CredentialStorage.this,
|
||||
R.string.credentials_erased, Toast.LENGTH_SHORT).show();
|
||||
clearLegacyVpnIfEstablished();
|
||||
} else {
|
||||
Toast.makeText(CredentialStorage.this,
|
||||
R.string.credentials_not_erased, Toast.LENGTH_SHORT).show();
|
||||
@@ -369,6 +371,14 @@ public final class CredentialStorage extends Activity {
|
||||
}
|
||||
}
|
||||
|
||||
private void clearLegacyVpnIfEstablished() {
|
||||
boolean isDone = VpnUtils.disconnectLegacyVpn(getApplicationContext());
|
||||
if (isDone) {
|
||||
Toast.makeText(CredentialStorage.this, R.string.vpn_disconnected,
|
||||
Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Prompt for key guard configuration confirmation.
|
||||
*/
|
||||
|
Reference in New Issue
Block a user