commit 6c500a4c5aa7cb6c009e6795b74765d9b4430504
author Chia-chi Yeh <chiachi@android.com> Sat Jul 02 20:19:26 2011 -0700
committer Chia-chi Yeh <chiachi@android.com> Sat Jul 02 20:21:09 2011 -0700
tree 9640c3e7d699becd9ccbba74698188cc53ef235d
parent 7e026b38e9e0670b3142702d9304ef6093212cf3

VPN: remove the old VpnService.

Now VPN is (kind of) integrated into ConnectivityService.

Change-Id: If98e456e779f8e97f562d99c57d909b1f5d9db55

services/java/com/android/server/ConnectivityService.java

diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index 68e85b6..bdef1d9 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -44,7 +44,6 @@
 import android.net.Proxy;
 import android.net.ProxyProperties;
 import android.net.RouteInfo;
-import android.net.vpn.VpnManager;
 import android.net.wifi.WifiStateTracker;
 import android.os.Binder;
 import android.os.FileUtils;
@@ -496,11 +495,8 @@
         mSettingsObserver.observe(mContext);
 
         loadGlobalProxy();
-
-        VpnManager.startVpnService(context);
     }
 
-
     /**
      * Sets the preferred network.
      * @param preference the new preference