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

Remove dead code.

Browse Source 
Also adds a TYPE_VPN so the VPN can be strongly typed.

Change-Id: Ibf39450c480f16ce5ab4c25b47965691b844fb92
This commit is contained in:
Robert Greenwalt
2014-07-07 17:09:01 -07:00
parent f7c7336625
commit ce7a144472
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -491,11 +491,17 @@ public class ConnectivityManager {
*/ */
public static final int TYPE_PROXY = 16; public static final int TYPE_PROXY = 16;
/** {@hide} */ /**
public static final int MAX_RADIO_TYPE = TYPE_PROXY; * A virtual network using one or more native bearers.
* It may or may not be providing security services.
*/
public static final int TYPE_VPN = 17;
/** {@hide} */ /** {@hide} */
public static final int MAX_NETWORK_TYPE = TYPE_PROXY; public static final int MAX_RADIO_TYPE = TYPE_VPN;
/** {@hide} */
public static final int MAX_NETWORK_TYPE = TYPE_VPN;
/** /**
* If you want to set the default network preference,you can directly * If you want to set the default network preference,you can directly

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

@@ -60,7 +60,6 @@ import android.content.res.Resources;
import android.database.ContentObserver; import android.database.ContentObserver;
import android.net.CaptivePortalTracker; import android.net.CaptivePortalTracker;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.DummyDataStateTracker;
import android.net.IConnectivityManager; import android.net.IConnectivityManager;
import android.net.INetworkManagementEventObserver; import android.net.INetworkManagementEventObserver;
import android.net.INetworkPolicyListener; import android.net.INetworkPolicyListener;
@@ -925,8 +924,6 @@ public class ConnectivityService extends IConnectivityManager.Stub {
@Override @Override
public NetworkStateTracker createTracker(int targetNetworkType, NetworkConfig config) { public NetworkStateTracker createTracker(int targetNetworkType, NetworkConfig config) {
switch (config.radio) { switch (config.radio) {
case TYPE_DUMMY:
return new DummyDataStateTracker(targetNetworkType, config.name);
case TYPE_WIMAX: case TYPE_WIMAX:
return makeWimaxStateTracker(mContext, mTrackerHandler); return makeWimaxStateTracker(mContext, mTrackerHandler);
case TYPE_PROXY: case TYPE_PROXY: