commit 9f83abb01a84ca47a0da6bcb0c26b14100336eaa
author Robert Greenwalt <rgreenwalt@google.com> Fri Jan 21 12:06:16 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 21 12:06:16 2011 -0800
tree 28a06d20a7bf771763784b435a5e25fd7051a83e
parent 4116cd5901c816f1ad80b753ce68464ffeaece2c
parent 2e1763cb15aab321ba80bd5196e02358c0dc89a5

Merge "Switch from NetworkUtils to netd for iface config."

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 d0df6cf..f98b7e9 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -32,6 +32,7 @@
 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 @@
         mSettingsObserver.observe(mContext);
 
         loadGlobalProxy();
+
+        VpnManager.startVpnService(context);
     }