LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

VPN: export legacy VPN in IConnectivityManager.

Browse Source 
Change-Id: I016fe056ceab39ffc36aa235d14b30a9f094a2e1
This commit is contained in:
Chia-chi Yeh
2011-07-02 17:15:00 -07:00
parent d050d1c82c
commit 7e026b38e9
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/net/IConnectivityManager.aidl
View File

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

9
services/java/com/android/server/ConnectivityService.java
View File

@@ -2505,6 +2505,15 @@ public class ConnectivityService extends IConnectivityManager.Stub {
return mVpn.establish(config); 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() { private String getDefaultInterface() {
if (ConnectivityManager.isNetworkTypeValid(mActiveDefaultNetwork)) { if (ConnectivityManager.isNetworkTypeValid(mActiveDefaultNetwork)) {
NetworkStateTracker tracker = mNetTrackers[mActiveDefaultNetwork]; NetworkStateTracker tracker = mNetTrackers[mActiveDefaultNetwork];