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

Add proxy as another network.

Browse Source 
Change-Id: I70cb6ac5604c4f0d6a752a291c40de2445ae98bb
This commit is contained in:
Hui Lu
2014-01-15 11:05:36 -05:00
parent 5215517c3a
commit 865b70dfcf
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/net/ConnectivityManager.java
View File

@@ -361,11 +361,17 @@ public class ConnectivityManager {
*/ */
public static final int TYPE_MOBILE_IA = 14; public static final int TYPE_MOBILE_IA = 14;
/** {@hide} */ /**
public static final int MAX_RADIO_TYPE = TYPE_MOBILE_IA; * The network that uses proxy to achieve connectivity.
* {@hide}
*/
public static final int TYPE_PROXY = 16;
/** {@hide} */ /** {@hide} */
public static final int MAX_NETWORK_TYPE = TYPE_MOBILE_IA; public static final int MAX_RADIO_TYPE = TYPE_PROXY;
/** {@hide} */
public static final int MAX_NETWORK_TYPE = TYPE_PROXY;
/** /**
* If you want to set the default network preference,you can directly * If you want to set the default network preference,you can directly
@@ -444,6 +450,8 @@ public class ConnectivityManager {
return "WIFI_P2P"; return "WIFI_P2P";
case TYPE_MOBILE_IA: case TYPE_MOBILE_IA:
return "MOBILE_IA"; return "MOBILE_IA";
case TYPE_PROXY:
return "PROXY";
default: default:
return Integer.toString(type); return Integer.toString(type);
} }

4
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -26,6 +26,7 @@ import static android.net.ConnectivityManager.TYPE_ETHERNET;
import static android.net.ConnectivityManager.TYPE_MOBILE; import static android.net.ConnectivityManager.TYPE_MOBILE;
import static android.net.ConnectivityManager.TYPE_WIFI; import static android.net.ConnectivityManager.TYPE_WIFI;
import static android.net.ConnectivityManager.TYPE_WIMAX; 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.getNetworkTypeName;
import static android.net.ConnectivityManager.isNetworkTypeValid; import static android.net.ConnectivityManager.isNetworkTypeValid;
import static android.net.NetworkPolicyManager.RULE_ALLOW_ALL; import static android.net.NetworkPolicyManager.RULE_ALLOW_ALL;
@@ -69,6 +70,7 @@ import android.net.NetworkState;
import android.net.NetworkStateTracker; import android.net.NetworkStateTracker;
import android.net.NetworkUtils; import android.net.NetworkUtils;
import android.net.Proxy; import android.net.Proxy;
import android.net.ProxyDataTracker;
import android.net.ProxyProperties; import android.net.ProxyProperties;
import android.net.RouteInfo; import android.net.RouteInfo;
import android.net.SamplingDataTracker; import android.net.SamplingDataTracker;
@@ -729,6 +731,8 @@ public class ConnectivityService extends IConnectivityManager.Stub {
return makeWimaxStateTracker(mContext, mTrackerHandler); return makeWimaxStateTracker(mContext, mTrackerHandler);
case TYPE_ETHERNET: case TYPE_ETHERNET:
return EthernetDataTracker.getInstance(); return EthernetDataTracker.getInstance();
case TYPE_PROXY:
return new ProxyDataTracker();
default: default:
throw new IllegalArgumentException( throw new IllegalArgumentException(
"Trying to create a NetworkStateTracker for an unknown radio type: " "Trying to create a NetworkStateTracker for an unknown radio type: "