diff options
| author | Chia-chi Yeh <chiachi@android.com> | 2011-07-02 17:28:45 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-02 17:28:45 -0700 |
| commit | 0c6bb2737e231c365656befe1d4ce44557de939a (patch) | |
| tree | bdb26e66cb7c7cb883f73b6ca27fda1cdd58f99b | |
| parent | 31c10a95872d5c0543e4fd2473cf1bcde6207afd (diff) | |
| parent | 77fd485c2ff780d1e6ef0ba1e3e811370ecbc528 (diff) | |
| download | frameworks_base-0c6bb2737e231c365656befe1d4ce44557de939a.zip frameworks_base-0c6bb2737e231c365656befe1d4ce44557de939a.tar.gz frameworks_base-0c6bb2737e231c365656befe1d4ce44557de939a.tar.bz2 | |
Merge "VPN: export legacy VPN in IConnectivityManager."
| -rw-r--r-- | core/java/android/net/IConnectivityManager.aidl | 2 | ||||
| -rw-r--r-- | services/java/com/android/server/ConnectivityService.java | 9 |
2 files changed, 11 insertions, 0 deletions
diff --git a/core/java/android/net/IConnectivityManager.aidl b/core/java/android/net/IConnectivityManager.aidl index fba16e1..e3c49ac 100644 --- a/core/java/android/net/IConnectivityManager.aidl +++ b/core/java/android/net/IConnectivityManager.aidl @@ -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); } diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java index 663f4f4..68e85b6 100644 --- a/services/java/com/android/server/ConnectivityService.java +++ b/services/java/com/android/server/ConnectivityService.java @@ -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]; |