diff options
author | Hung-ying Tyan <tyanh@google.com> | 2009-07-06 23:31:33 +0800 |
---|---|---|
committer | Hung-ying Tyan <tyanh@google.com> | 2009-07-06 23:38:48 +0800 |
commit | 46841db4f2c7360d3b861a816e51f76acca0d677 (patch) | |
tree | 606853c4794825f9a9ff57ad374dcee7a101ee2f /packages/VpnServices/src | |
parent | 1f2bb46b9a2762a6f57ca8801d91e9dee002158f (diff) | |
download | frameworks_base-46841db4f2c7360d3b861a816e51f76acca0d677.zip frameworks_base-46841db4f2c7360d3b861a816e51f76acca0d677.tar.gz frameworks_base-46841db4f2c7360d3b861a816e51f76acca0d677.tar.bz2 |
Add PPTP and L2TP/IPSec PSK service dispatching
Diffstat (limited to 'packages/VpnServices/src')
-rw-r--r-- | packages/VpnServices/src/com/android/server/vpn/VpnServiceBinder.java | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/packages/VpnServices/src/com/android/server/vpn/VpnServiceBinder.java b/packages/VpnServices/src/com/android/server/vpn/VpnServiceBinder.java index 63fc858..617875e 100644 --- a/packages/VpnServices/src/com/android/server/vpn/VpnServiceBinder.java +++ b/packages/VpnServices/src/com/android/server/vpn/VpnServiceBinder.java @@ -20,7 +20,9 @@ import android.app.Service; import android.content.Intent; import android.net.vpn.IVpnService; import android.net.vpn.L2tpIpsecProfile; +import android.net.vpn.L2tpIpsecPskProfile; import android.net.vpn.L2tpProfile; +import android.net.vpn.PptpProfile; import android.net.vpn.VpnManager; import android.net.vpn.VpnProfile; import android.net.vpn.VpnState; @@ -83,16 +85,26 @@ public class VpnServiceBinder extends Service { private VpnService<? extends VpnProfile> createService(VpnProfile p) { switch (p.getType()) { - case L2TP_IPSEC: - L2tpIpsecService l2tpIpsec = new L2tpIpsecService(); - l2tpIpsec.setContext(this, (L2tpIpsecProfile) p); - return l2tpIpsec; - case L2TP: L2tpService l2tp = new L2tpService(); l2tp.setContext(this, (L2tpProfile) p); return l2tp; + case PPTP: + PptpService pptp = new PptpService(); + pptp.setContext(this, (PptpProfile) p); + return pptp; + + case L2TP_IPSEC_PSK: + L2tpIpsecPskService psk = new L2tpIpsecPskService(); + psk.setContext(this, (L2tpIpsecPskProfile) p); + return psk; + + case L2TP_IPSEC: + L2tpIpsecService l2tpIpsec = new L2tpIpsecService(); + l2tpIpsec.setContext(this, (L2tpIpsecProfile) p); + return l2tpIpsec; + default: return null; } |