VPN: remove the old VpnService.
Now VPN is (kind of) integrated into ConnectivityService. Change-Id: If98e456e779f8e97f562d99c57d909b1f5d9db55
This commit is contained in:
@@ -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
|
||||||
|
|||||||
Reference in New Issue
Block a user