From 7e026b38e9e0670b3142702d9304ef6093212cf3 Mon Sep 17 00:00:00 2001
From: Chia-chi Yeh <chiachi@android.com>
Date: Sat, 2 Jul 2011 17:15:00 -0700
Subject: [PATCH] VPN: export legacy VPN in IConnectivityManager.

Change-Id: I016fe056ceab39ffc36aa235d14b30a9f094a2e1
---
 core/java/android/net/IConnectivityManager.aidl          | 2 ++
 .../java/com/android/server/ConnectivityService.java     | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/core/java/android/net/IConnectivityManager.aidl b/core/java/android/net/IConnectivityManager.aidl
index fba16e12df..e3c49acdad 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 663f4f47f5..68e85b6155 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];