summaryrefslogtreecommitdiffstats
path: root/services/core
diff options
context:
space:
mode:
authorHui Lu <huilu@google.com>2014-01-15 11:05:36 -0500
committerHui Lu <huilu@google.com>2014-01-30 17:26:18 -0500
commit1c5624a0128397fa6fd6484e6a473bad10547a34 (patch)
tree8d66ff46dafc7d4d235828a257a65e585e3189f1 /services/core
parenta850e5ac27662ff2030d6a3d3f1ce1f6cb7c2e44 (diff)
downloadframeworks_base-1c5624a0128397fa6fd6484e6a473bad10547a34.zip
frameworks_base-1c5624a0128397fa6fd6484e6a473bad10547a34.tar.gz
frameworks_base-1c5624a0128397fa6fd6484e6a473bad10547a34.tar.bz2
Add proxy as another network.
Change-Id: I70cb6ac5604c4f0d6a752a291c40de2445ae98bb
Diffstat (limited to 'services/core')
-rw-r--r--services/core/java/com/android/server/ConnectivityService.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index d42ae3a..8d158cf 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -26,6 +26,7 @@ import static android.net.ConnectivityManager.TYPE_ETHERNET;
import static android.net.ConnectivityManager.TYPE_MOBILE;
import static android.net.ConnectivityManager.TYPE_WIFI;
import static android.net.ConnectivityManager.TYPE_WIMAX;
+import static android.net.ConnectivityManager.TYPE_PROXY;
import static android.net.ConnectivityManager.getNetworkTypeName;
import static android.net.ConnectivityManager.isNetworkTypeValid;
import static android.net.NetworkPolicyManager.RULE_ALLOW_ALL;
@@ -69,6 +70,7 @@ import android.net.NetworkState;
import android.net.NetworkStateTracker;
import android.net.NetworkUtils;
import android.net.Proxy;
+import android.net.ProxyDataTracker;
import android.net.ProxyProperties;
import android.net.RouteInfo;
import android.net.SamplingDataTracker;
@@ -729,6 +731,8 @@ public class ConnectivityService extends IConnectivityManager.Stub {
return makeWimaxStateTracker(mContext, mTrackerHandler);
case TYPE_ETHERNET:
return EthernetDataTracker.getInstance();
+ case TYPE_PROXY:
+ return new ProxyDataTracker();
default:
throw new IllegalArgumentException(
"Trying to create a NetworkStateTracker for an unknown radio type: "