03159e4c85
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
78 lines
2.8 KiB
Java
78 lines
2.8 KiB
Java
/*
|
|
* Copyright (C) 2016 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
package com.android.settings.vpn2;
|
|
|
|
import android.content.Context;
|
|
import android.net.ConnectivityManager;
|
|
import android.net.IConnectivityManager;
|
|
import android.os.RemoteException;
|
|
import android.os.ServiceManager;
|
|
import android.security.Credentials;
|
|
import android.security.KeyStore;
|
|
import android.util.Log;
|
|
|
|
import com.android.internal.net.LegacyVpnInfo;
|
|
import com.android.internal.net.VpnConfig;
|
|
|
|
/**
|
|
* Utility functions for vpn.
|
|
*
|
|
* Keystore methods should only be called in system user
|
|
*/
|
|
public class VpnUtils {
|
|
|
|
private static final String TAG = "VpnUtils";
|
|
|
|
public static String getLockdownVpn() {
|
|
final byte[] value = KeyStore.getInstance().get(Credentials.LOCKDOWN_VPN);
|
|
return value == null ? null : new String(value);
|
|
}
|
|
|
|
public static void clearLockdownVpn(Context context) {
|
|
KeyStore.getInstance().delete(Credentials.LOCKDOWN_VPN);
|
|
// Always notify ConnectivityManager after keystore update
|
|
context.getSystemService(ConnectivityManager.class).updateLockdownVpn();
|
|
}
|
|
|
|
public static void setLockdownVpn(Context context, String lockdownKey) {
|
|
KeyStore.getInstance().put(Credentials.LOCKDOWN_VPN, lockdownKey.getBytes(),
|
|
KeyStore.UID_SELF, /* flags */ 0);
|
|
// Always notify ConnectivityManager after keystore update
|
|
context.getSystemService(ConnectivityManager.class).updateLockdownVpn();
|
|
}
|
|
|
|
public static boolean isVpnLockdown(String key) {
|
|
return key.equals(getLockdownVpn());
|
|
}
|
|
|
|
public static boolean disconnectLegacyVpn(Context context) {
|
|
try {
|
|
int userId = context.getUserId();
|
|
IConnectivityManager connectivityService = IConnectivityManager.Stub
|
|
.asInterface(ServiceManager.getService(Context.CONNECTIVITY_SERVICE));
|
|
LegacyVpnInfo currentLegacyVpn = connectivityService.getLegacyVpnInfo(userId);
|
|
if (currentLegacyVpn != null) {
|
|
clearLockdownVpn(context);
|
|
connectivityService.prepareVpn(null, VpnConfig.LEGACY_VPN, userId);
|
|
return true;
|
|
}
|
|
} catch (RemoteException e) {
|
|
Log.e(TAG, "Legacy VPN could not be disconnected", e);
|
|
}
|
|
return false;
|
|
}
|
|
}
|