diff options
author | Robert Greenwalt <rgreenwalt@google.com> | 2011-02-21 11:22:35 -0800 |
---|---|---|
committer | Robert Greenwalt <rgreenwalt@google.com> | 2011-02-21 11:22:35 -0800 |
commit | 645b83f3ec2ead154c2062fd6d4498713d11de7e (patch) | |
tree | c7e20a0ceae88f8a2509ee0c0314670f03681ba0 /core/java/android | |
parent | 90e711670af9a1d48aec04dda85272d8ec4334dc (diff) | |
download | frameworks_base-645b83f3ec2ead154c2062fd6d4498713d11de7e.zip frameworks_base-645b83f3ec2ead154c2062fd6d4498713d11de7e.tar.gz frameworks_base-645b83f3ec2ead154c2062fd6d4498713d11de7e.tar.bz2 |
Remove some unused code.
Change-Id: Id29bf7d2118065e2e772b22d910bda1c6de2a475
Diffstat (limited to 'core/java/android')
-rw-r--r-- | core/java/android/net/DummyDataStateTracker.java | 21 | ||||
-rw-r--r-- | core/java/android/net/MobileDataStateTracker.java | 69 | ||||
-rw-r--r-- | core/java/android/net/NetworkStateTracker.java | 33 |
3 files changed, 0 insertions, 123 deletions
diff --git a/core/java/android/net/DummyDataStateTracker.java b/core/java/android/net/DummyDataStateTracker.java index daa1c09..d0c77cf 100644 --- a/core/java/android/net/DummyDataStateTracker.java +++ b/core/java/android/net/DummyDataStateTracker.java @@ -70,15 +70,6 @@ public class DummyDataStateTracker implements NetworkStateTracker { mContext = context; } - /** - * Return the IP addresses of the DNS servers available for the mobile data - * network interface. - * @return a list of DNS addresses, with no holes. - */ - public String[] getDnsPropNames() { - return new String[0]; - } - public boolean isPrivateDnsRouteSet() { return mPrivateDnsRouteSet; } @@ -91,10 +82,6 @@ public class DummyDataStateTracker implements NetworkStateTracker { return mNetworkInfo; } - public int getDefaultGatewayAddr() { - return 0; - } - public boolean isDefaultRouteSet() { return mDefaultRouteSet; } @@ -181,14 +168,6 @@ public class DummyDataStateTracker implements NetworkStateTracker { return true; } - public int startUsingNetworkFeature(String feature, int callingPid, int callingUid) { - return -1; - } - - public int stopUsingNetworkFeature(String feature, int callingPid, int callingUid) { - return -1; - } - public void setDataEnable(boolean enabled) { } diff --git a/core/java/android/net/MobileDataStateTracker.java b/core/java/android/net/MobileDataStateTracker.java index 9ecd68c..e04964e 100644 --- a/core/java/android/net/MobileDataStateTracker.java +++ b/core/java/android/net/MobileDataStateTracker.java @@ -59,7 +59,6 @@ public class MobileDataStateTracker implements NetworkStateTracker { private ITelephony mPhoneService; private String mApnType; - private static String[] sDnsPropNames; private NetworkInfo mNetworkInfo; private boolean mTeardownRequested = false; private Handler mTarget; @@ -67,7 +66,6 @@ public class MobileDataStateTracker implements NetworkStateTracker { private LinkProperties mLinkProperties; private LinkCapabilities mLinkCapabilities; private boolean mPrivateDnsRouteSet = false; - private int mDefaultGatewayAddr = 0; private boolean mDefaultRouteSet = false; // DEFAULT and HIPRI are the same connection. If we're one of these we need to check if @@ -94,18 +92,6 @@ public class MobileDataStateTracker implements NetworkStateTracker { } mPhoneService = null; - - sDnsPropNames = new String[] { - "net.rmnet0.dns1", - "net.rmnet0.dns2", - "net.eth0.dns1", - "net.eth0.dns2", - "net.eth0.dns3", - "net.eth0.dns4", - "net.gprs.dns1", - "net.gprs.dns2", - "net.ppp0.dns1", - "net.ppp0.dns2"}; } /** @@ -166,15 +152,6 @@ public class MobileDataStateTracker implements NetworkStateTracker { } } - /** - * Return the IP addresses of the DNS servers available for the mobile data - * network interface. - * @return a list of DNS addresses, with no holes. - */ - public String[] getDnsPropNames() { - return sDnsPropNames; - } - public boolean isPrivateDnsRouteSet() { return mPrivateDnsRouteSet; } @@ -187,10 +164,6 @@ public class MobileDataStateTracker implements NetworkStateTracker { return mNetworkInfo; } - public int getDefaultGatewayAddr() { - return mDefaultGatewayAddr; - } - public boolean isDefaultRouteSet() { return mDefaultRouteSet; } @@ -279,7 +252,6 @@ public class MobileDataStateTracker implements NetworkStateTracker { //if (DBG) log("clearing mInterfaceName for "+ mApnType + // " as it DISCONNECTED"); //mInterfaceName = null; - //mDefaultGatewayAddr = 0; break; case CONNECTING: setDetailedState(DetailedState.CONNECTING, reason, apnName); @@ -507,47 +479,6 @@ public class MobileDataStateTracker implements NetworkStateTracker { } /** - * Tells the phone sub-system that the caller wants to - * begin using the named feature. The only supported features at - * this time are {@code Phone.FEATURE_ENABLE_MMS}, which allows an application - * to specify that it wants to send and/or receive MMS data, and - * {@code Phone.FEATURE_ENABLE_SUPL}, which is used for Assisted GPS. - * @param feature the name of the feature to be used - * @param callingPid the process ID of the process that is issuing this request - * @param callingUid the user ID of the process that is issuing this request - * @return an integer value representing the outcome of the request. - * The interpretation of this value is feature-specific. - * specific, except that the value {@code -1} - * always indicates failure. For {@code Phone.FEATURE_ENABLE_MMS}, - * the other possible return values are - * <ul> - * <li>{@code Phone.APN_ALREADY_ACTIVE}</li> - * <li>{@code Phone.APN_REQUEST_STARTED}</li> - * <li>{@code Phone.APN_TYPE_NOT_AVAILABLE}</li> - * <li>{@code Phone.APN_REQUEST_FAILED}</li> - * </ul> - */ - public int startUsingNetworkFeature(String feature, int callingPid, int callingUid) { - return -1; - } - - /** - * Tells the phone sub-system that the caller is finished - * using the named feature. The only supported feature at - * this time is {@code Phone.FEATURE_ENABLE_MMS}, which allows an application - * to specify that it wants to send and/or receive MMS data. - * @param feature the name of the feature that is no longer needed - * @param callingPid the process ID of the process that is issuing this request - * @param callingUid the user ID of the process that is issuing this request - * @return an integer value representing the outcome of the request. - * The interpretation of this value is feature-specific, except that - * the value {@code -1} always indicates failure. - */ - public int stopUsingNetworkFeature(String feature, int callingPid, int callingUid) { - return -1; - } - - /** * @param enabled */ public void setDataEnable(boolean enabled) { diff --git a/core/java/android/net/NetworkStateTracker.java b/core/java/android/net/NetworkStateTracker.java index e378506..eb97d77 100644 --- a/core/java/android/net/NetworkStateTracker.java +++ b/core/java/android/net/NetworkStateTracker.java @@ -136,39 +136,6 @@ public interface NetworkStateTracker { public boolean isAvailable(); /** - * Fetch default gateway address for the network - */ - public int getDefaultGatewayAddr(); - - /** - * Tells the underlying networking system that the caller wants to - * begin using the named feature. The interpretation of {@code feature} - * is completely up to each networking implementation. - * @param feature the name of the feature to be used - * @param callingPid the process ID of the process that is issuing this request - * @param callingUid the user ID of the process that is issuing this request - * @return an integer value representing the outcome of the request. - * The interpretation of this value is specific to each networking - * implementation+feature combination, except that the value {@code -1} - * always indicates failure. - */ - public int startUsingNetworkFeature(String feature, int callingPid, int callingUid); - - /** - * Tells the underlying networking system that the caller is finished - * using the named feature. The interpretation of {@code feature} - * is completely up to each networking implementation. - * @param feature the name of the feature that is no longer needed. - * @param callingPid the process ID of the process that is issuing this request - * @param callingUid the user ID of the process that is issuing this request - * @return an integer value representing the outcome of the request. - * The interpretation of this value is specific to each networking - * implementation+feature combination, except that the value {@code -1} - * always indicates failure. - */ - public int stopUsingNetworkFeature(String feature, int callingPid, int callingUid); - - /** * @param enabled */ public void setDataEnable(boolean enabled); |