VPN: remove the old VpnService.

Now VPN is (kind of) integrated into ConnectivityService.

Change-Id: If98e456e779f8e97f562d99c57d909b1f5d9db55
This commit is contained in:
Chia-chi Yeh
2011-07-02 20:19:26 -07:00
parent 7e026b38e9
commit 6c500a4c5a

View File

@@ -44,7 +44,6 @@ import android.net.NetworkUtils;
import android.net.Proxy; import android.net.Proxy;
import android.net.ProxyProperties; import android.net.ProxyProperties;
import android.net.RouteInfo; import android.net.RouteInfo;
import android.net.vpn.VpnManager;
import android.net.wifi.WifiStateTracker; import android.net.wifi.WifiStateTracker;
import android.os.Binder; import android.os.Binder;
import android.os.FileUtils; import android.os.FileUtils;
@@ -496,11 +495,8 @@ public class ConnectivityService extends IConnectivityManager.Stub {
mSettingsObserver.observe(mContext); mSettingsObserver.observe(mContext);
loadGlobalProxy(); loadGlobalProxy();
VpnManager.startVpnService(context);
} }
/** /**
* Sets the preferred network. * Sets the preferred network.
* @param preference the new preference * @param preference the new preference