VPN: export legacy VPN in IConnectivityManager. am: 7e026b38e9

Original change: undetermined

Change-Id: I0dc73553f057e337d6b414ae5de159dee57573c0
This commit is contained in:
Chia-chi Yeh
2021-05-31 04:40:44 +00:00
committed by Automerger Merge Worker
2 changed files with 11 additions and 0 deletions

View File

@@ -104,4 +104,6 @@ interface IConnectivityManager
String prepareVpn(String packageName);
ParcelFileDescriptor establishVpn(in VpnConfig config);
void doLegacyVpn(in VpnConfig config, in String[] racoon, in String[] mtpd);
}

View File

@@ -2505,6 +2505,15 @@ public class ConnectivityService extends IConnectivityManager.Stub {
return mVpn.establish(config);
}
/**
* Handle a legacy VPN request.
* @hide
*/
@Override
public void doLegacyVpn(VpnConfig config, String[] racoon, String[] mtpd) {
mVpn.doLegacyVpn(config, racoon, mtpd);
}
private String getDefaultInterface() {
if (ConnectivityManager.isNetworkTypeValid(mActiveDefaultNetwork)) {
NetworkStateTracker tracker = mNetTrackers[mActiveDefaultNetwork];