diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2011-01-19 22:46:32 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-19 22:46:32 -0800 |
| commit | 3ed8dcfc4273e07dda699ba35b42c5c7c0bd906f (patch) | |
| tree | a7f67aa872847a695fca5ec8ddd4eb2ba225c29a /services/java/com/android/server/ConnectivityService.java | |
| parent | d45f5711f32d1fca68085dca2b34f7f78be13245 (diff) | |
| parent | 9e0357b96bd5c84e39c3084625d58b21f9bad74c (diff) | |
am 9e0357b9: am 71196f0c: Merge "Make VpnService synchronous API." into honeycomb
* commit '9e0357b96bd5c84e39c3084625d58b21f9bad74c':
Make VpnService synchronous API.
Diffstat (limited to 'services/java/com/android/server/ConnectivityService.java')
| -rw-r--r-- | services/java/com/android/server/ConnectivityService.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java index d0df6cfe7512..f98b7e94d7ea 100644 --- a/services/java/com/android/server/ConnectivityService.java +++ b/services/java/com/android/server/ConnectivityService.java @@ -32,6 +32,7 @@ import android.net.NetworkStateTracker; import android.net.NetworkUtils; import android.net.Proxy; import android.net.ProxyProperties; +import android.net.vpn.VpnManager; import android.net.wifi.WifiStateTracker; import android.os.Binder; import android.os.Handler; @@ -442,6 +443,8 @@ public class ConnectivityService extends IConnectivityManager.Stub { mSettingsObserver.observe(mContext); loadGlobalProxy(); + + VpnManager.startVpnService(context); } |