Merge "Remove DhcpInfoInternal" (321020b7) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -12575,7 +12575,7 @@ package android.net {
		method public int getUid();
		}

		public class DhcpInfo implements android.os.Parcelable {
		public deprecated class DhcpInfo implements android.os.Parcelable {
		ctor public DhcpInfo();
		method public int describeContents();
		method public void writeToParcel(android.os.Parcel, int);
		@@ -13442,7 +13442,7 @@ package android.net.wifi {
		method public boolean enableNetwork(int, boolean);
		method public java.util.List<android.net.wifi.WifiConfiguration> getConfiguredNetworks();
		method public android.net.wifi.WifiInfo getConnectionInfo();
		method public android.net.DhcpInfo getDhcpInfo();
		method public deprecated android.net.DhcpInfo getDhcpInfo();
		method public java.util.List<android.net.wifi.ScanResult> getScanResults();
		method public int getWifiState();
		method public boolean isWifiEnabled();

core/java/android/bluetooth/BluetoothTetheringDataTracker.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@ import android.os.ServiceManager;
		import android.os.INetworkManagementService;
		import android.content.Context;
		import android.net.ConnectivityManager;
		import android.net.DhcpInfoInternal;
		import android.net.LinkCapabilities;
		import android.net.LinkProperties;
		import android.net.NetworkInfo;

core/java/android/net/DhcpInfo.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -22,16 +22,17 @@ import java.net.InetAddress;

		/**
		* A simple object for retrieving the results of a DHCP request.
		* @deprecated - use LinkProperties - To be removed 11/2013
		* STOPSHIP - make sure we expose LinkProperties through ConnectivityManager
		*/
		public class DhcpInfo implements Parcelable {
		public int ipAddress;
		public int gateway;
		public int netmask;

		public int dns1;
		public int dns2;

		public int serverAddress;

		public int leaseDuration;

		public DhcpInfo() {

core/java/android/net/DhcpInfoInternal.java

deleted100644 → 0

+0 −166

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2010 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.net;

		import android.text.TextUtils;
		import android.util.Log;

		import java.net.Inet4Address;
		import java.net.InetAddress;
		import java.util.ArrayList;
		import java.util.Collection;
		import java.util.Collections;

		/**
		* A simple object for retrieving the results of a DHCP request.
		* Replaces (internally) the IPv4-only DhcpInfo class.
		* @hide
		*/
		public class DhcpInfoInternal {
		private final static String TAG = "DhcpInfoInternal";
		public String ipAddress;
		public int prefixLength;

		public String dns1;
		public String dns2;

		public String serverAddress;
		public int leaseDuration;

		/**
		* Vendor specific information (from RFC 2132).
		*/
		public String vendorInfo;

		private Collection<RouteInfo> mRoutes;

		public DhcpInfoInternal() {
		mRoutes = new ArrayList<RouteInfo>();
		}

		public void addRoute(RouteInfo routeInfo) {
		mRoutes.add(routeInfo);
		}

		public Collection<RouteInfo> getRoutes() {
		return Collections.unmodifiableCollection(mRoutes);
		}

		private int convertToInt(String addr) {
		if (addr != null) {
		try {
		InetAddress inetAddress = NetworkUtils.numericToInetAddress(addr);
		if (inetAddress instanceof Inet4Address) {
		return NetworkUtils.inetAddressToInt(inetAddress);
		}
		} catch (IllegalArgumentException e) {}
		}
		return 0;
		}

		public DhcpInfo makeDhcpInfo() {
		DhcpInfo info = new DhcpInfo();
		info.ipAddress = convertToInt(ipAddress);
		for (RouteInfo route : mRoutes) {
		if (route.isDefaultRoute()) {
		info.gateway = convertToInt(route.getGateway().getHostAddress());
		break;
		}
		}
		try {
		InetAddress inetAddress = NetworkUtils.numericToInetAddress(ipAddress);
		info.netmask = NetworkUtils.prefixLengthToNetmaskInt(prefixLength);
		} catch (IllegalArgumentException e) {}
		info.dns1 = convertToInt(dns1);
		info.dns2 = convertToInt(dns2);
		info.serverAddress = convertToInt(serverAddress);
		info.leaseDuration = leaseDuration;
		return info;
		}

		public LinkAddress makeLinkAddress() {
		if (TextUtils.isEmpty(ipAddress)) {
		Log.e(TAG, "makeLinkAddress with empty ipAddress");
		return null;
		}
		return new LinkAddress(NetworkUtils.numericToInetAddress(ipAddress), prefixLength);
		}

		public LinkProperties makeLinkProperties() {
		LinkProperties p = new LinkProperties();
		p.addLinkAddress(makeLinkAddress());
		for (RouteInfo route : mRoutes) {
		p.addRoute(route);
		}
		//if empty, connectivity configures default DNS
		if (TextUtils.isEmpty(dns1) == false) {
		p.addDns(NetworkUtils.numericToInetAddress(dns1));
		} else {
		Log.d(TAG, "makeLinkProperties with empty dns1!");
		}
		if (TextUtils.isEmpty(dns2) == false) {
		p.addDns(NetworkUtils.numericToInetAddress(dns2));
		} else {
		Log.d(TAG, "makeLinkProperties with empty dns2!");
		}
		return p;
		}

		/* Updates the DHCP fields that need to be retained from
		* original DHCP request if the DHCP renewal shows them as
		* being empty
		*/
		public void updateFromDhcpRequest(DhcpInfoInternal orig) {
		if (orig == null) return;

		if (TextUtils.isEmpty(dns1)) {
		dns1 = orig.dns1;
		}

		if (TextUtils.isEmpty(dns2)) {
		dns2 = orig.dns2;
		}

		if (mRoutes.size() == 0) {
		for (RouteInfo route : orig.getRoutes()) {
		addRoute(route);
		}
		}
		}

		/**
		* Test if this DHCP lease includes vendor hint that network link is
		* metered, and sensitive to heavy data transfers.
		*/
		public boolean hasMeteredHint() {
		if (vendorInfo != null) {
		return vendorInfo.contains("ANDROID_METERED");
		} else {
		return false;
		}
		}

		public String toString() {
		String routeString = "";
		for (RouteInfo route : mRoutes) routeString += route.toString() + " \| ";
		return "addr: " + ipAddress + "/" + prefixLength +
		" mRoutes: " + routeString +
		" dns: " + dns1 + "," + dns2 +
		" dhcpServer: " + serverAddress +
		" leaseDuration: " + leaseDuration;
		}
		}

core/java/android/net/DhcpResults.aidl

0 → 100644

+19 −0

Original line number	Diff line number	Diff line
		/**
		* Copyright (c) 2012, The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.net;

		parcelable DhcpResults;