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

am 3cab7fc1: Merge "Add proxy as another network." into klp-modular-dev

Browse Source 
* commit '3cab7fc1b8f06166df3a58cf10d4a0db36bde788':
  Add proxy as another network.
This commit is contained in:
Hui Lu
2014-01-31 08:11:57 +00:00
committed by Android Git Automerger
parent 593cc7af27 07f2933a07
commit abb57909e0
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

@@ -360,11 +360,17 @@ public class ConnectivityManager {
*/
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} */
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
@@ -443,6 +449,8 @@ public class ConnectivityManager {
return "WIFI_P2P";
case TYPE_MOBILE_IA:
return "MOBILE_IA";
case TYPE_PROXY:
return "PROXY";
default:
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_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: "