Merge "Remove some unused code." (e5a3e979) · Commits · e / os / android_frameworks_base

core/java/android/net/DummyDataStateTracker.java

+0 −21

Original line number	Original line	Diff line number	Diff line
	@@ -70,15 +70,6 @@ public class DummyDataStateTracker implements NetworkStateTracker {
	mContext = context;		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() {		public boolean isPrivateDnsRouteSet() {
	return mPrivateDnsRouteSet;		return mPrivateDnsRouteSet;
	}		}
	@@ -91,10 +82,6 @@ public class DummyDataStateTracker implements NetworkStateTracker {
	return mNetworkInfo;		return mNetworkInfo;
	}		}

	public int getDefaultGatewayAddr() {
	return 0;
	}

	public boolean isDefaultRouteSet() {		public boolean isDefaultRouteSet() {
	return mDefaultRouteSet;		return mDefaultRouteSet;
	}		}
	@@ -181,14 +168,6 @@ public class DummyDataStateTracker implements NetworkStateTracker {
	return true;		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) {		public void setDataEnable(boolean enabled) {
	}		}

core/java/android/net/MobileDataStateTracker.java

+0 −69

Original line number	Original line	Diff line number	Diff line
	@@ -59,7 +59,6 @@ public class MobileDataStateTracker implements NetworkStateTracker {
	private ITelephony mPhoneService;		private ITelephony mPhoneService;

	private String mApnType;		private String mApnType;
	private static String[] sDnsPropNames;
	private NetworkInfo mNetworkInfo;		private NetworkInfo mNetworkInfo;
	private boolean mTeardownRequested = false;		private boolean mTeardownRequested = false;
	private Handler mTarget;		private Handler mTarget;
	@@ -67,7 +66,6 @@ public class MobileDataStateTracker implements NetworkStateTracker {
	private LinkProperties mLinkProperties;		private LinkProperties mLinkProperties;
	private LinkCapabilities mLinkCapabilities;		private LinkCapabilities mLinkCapabilities;
	private boolean mPrivateDnsRouteSet = false;		private boolean mPrivateDnsRouteSet = false;
	private int mDefaultGatewayAddr = 0;
	private boolean mDefaultRouteSet = false;		private boolean mDefaultRouteSet = false;

	// DEFAULT and HIPRI are the same connection. If we're one of these we need to check if		// 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;		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() {		public boolean isPrivateDnsRouteSet() {
	return mPrivateDnsRouteSet;		return mPrivateDnsRouteSet;
	}		}
	@@ -187,10 +164,6 @@ public class MobileDataStateTracker implements NetworkStateTracker {
	return mNetworkInfo;		return mNetworkInfo;
	}		}

	public int getDefaultGatewayAddr() {
	return mDefaultGatewayAddr;
	}

	public boolean isDefaultRouteSet() {		public boolean isDefaultRouteSet() {
	return mDefaultRouteSet;		return mDefaultRouteSet;
	}		}
	@@ -279,7 +252,6 @@ public class MobileDataStateTracker implements NetworkStateTracker {
	//if (DBG) log("clearing mInterfaceName for "+ mApnType +		//if (DBG) log("clearing mInterfaceName for "+ mApnType +
	// " as it DISCONNECTED");		// " as it DISCONNECTED");
	//mInterfaceName = null;		//mInterfaceName = null;
	//mDefaultGatewayAddr = 0;
	break;		break;
	case CONNECTING:		case CONNECTING:
	setDetailedState(DetailedState.CONNECTING, reason, apnName);		setDetailedState(DetailedState.CONNECTING, reason, apnName);
	@@ -506,47 +478,6 @@ public class MobileDataStateTracker implements NetworkStateTracker {
	return false;		return false;
	}		}

	/**
	* 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		* @param enabled
	*/		*/

core/java/android/net/NetworkStateTracker.java

+0 −33

Original line number	Original line	Diff line number	Diff line
	@@ -135,39 +135,6 @@ public interface NetworkStateTracker {
	*/		*/
	public boolean isAvailable();		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		* @param enabled
	*/		*/

wifi/java/android/net/wifi/WifiStateTracker.java

+0 −42

Original line number	Original line	Diff line number	Diff line
	@@ -45,7 +45,6 @@ public class WifiStateTracker implements NetworkStateTracker {

	private AtomicBoolean mTeardownRequested = new AtomicBoolean(false);		private AtomicBoolean mTeardownRequested = new AtomicBoolean(false);
	private AtomicBoolean mPrivateDnsRouteSet = new AtomicBoolean(false);		private AtomicBoolean mPrivateDnsRouteSet = new AtomicBoolean(false);
	private AtomicInteger mDefaultGatewayAddr = new AtomicInteger(0);
	private AtomicBoolean mDefaultRouteSet = new AtomicBoolean(false);		private AtomicBoolean mDefaultRouteSet = new AtomicBoolean(false);

	private LinkProperties mLinkProperties;		private LinkProperties mLinkProperties;
	@@ -135,40 +134,6 @@ public class WifiStateTracker implements NetworkStateTracker {
	return mNetworkInfo.isAvailable();		return mNetworkInfo.isAvailable();
	}		}

	/**
	* 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.
	* TODO: needs to go away
	*/
	public int startUsingNetworkFeature(String feature, int callingPid, int callingUid) {
	return -1;
	}

	/**
	* 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.
	* TODO: needs to go away
	*/
	public int stopUsingNetworkFeature(String feature, int callingPid, int callingUid) {
	return -1;
	}

	/**		/**
	* @param enabled		* @param enabled
	*/		*/
	@@ -214,13 +179,6 @@ public class WifiStateTracker implements NetworkStateTracker {
	return new LinkCapabilities(mLinkCapabilities);		return new LinkCapabilities(mLinkCapabilities);
	}		}

	/**
	* Fetch default gateway address for the network
	*/
	public int getDefaultGatewayAddr() {
	return mDefaultGatewayAddr.get();
	}

	/**		/**
	* Check if default route is set		* Check if default route is set
	*/		*/