LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 9e0357b9: am 71196f0c: Merge "Make VpnService synchronous API." into honeycomb

Browse Source 
* commit '9e0357b96bd5c84e39c3084625d58b21f9bad74c':
  Make VpnService synchronous API.
This commit is contained in:
Hung-ying Tyan
2011-01-19 22:46:32 -08:00
committed by Android Git Automerger
parent b3708c3de8 4e723420e0
commit 4116cd5901
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/java/com/android/server/ConnectivityService.java
View File

@@ -32,6 +32,7 @@ import android.net.NetworkStateTracker;
import android.net.NetworkUtils; import android.net.NetworkUtils;
import android.net.Proxy; import android.net.Proxy;
import android.net.ProxyProperties; import android.net.ProxyProperties;
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.Handler; import android.os.Handler;
@@ -442,6 +443,8 @@ public class ConnectivityService extends IConnectivityManager.Stub {
mSettingsObserver.observe(mContext); mSettingsObserver.observe(mContext);
loadGlobalProxy(); loadGlobalProxy();
VpnManager.startVpnService(context);
} }