Merge "Add accessors for all addresses and clarify compare* methods" (e1cd2931) · Commits · e / os / android_frameworks_base

core/java/android/net/LinkProperties.java

+45 −19

Original line number	Diff line number	Diff line
		@@ -128,6 +128,9 @@ public class LinkProperties implements Parcelable {
		return interfaceNames;
		}

		/**
		* Returns all the addresses on this link.
		*/
		public Collection<InetAddress> getAddresses() {
		Collection<InetAddress> addresses = new ArrayList<InetAddress>();
		for (LinkAddress linkAddress : mLinkAddresses) {
		@@ -136,14 +139,43 @@ public class LinkProperties implements Parcelable {
		return Collections.unmodifiableCollection(addresses);
		}

		/**
		* Returns all the addresses on this link and all the links stacked above it.
		*/
		public Collection<InetAddress> getAllAddresses() {
		Collection<InetAddress> addresses = new ArrayList<InetAddress>();
		for (LinkAddress linkAddress : mLinkAddresses) {
		addresses.add(linkAddress.getAddress());
		}
		for (LinkProperties stacked: mStackedLinks.values()) {
		addresses.addAll(stacked.getAllAddresses());
		}
		return addresses;
		}

		public void addLinkAddress(LinkAddress address) {
		if (address != null) mLinkAddresses.add(address);
		}

		/**
		* Returns all the addresses on this link.
		*/
		public Collection<LinkAddress> getLinkAddresses() {
		return Collections.unmodifiableCollection(mLinkAddresses);
		}

		/**
		* Returns all the addresses on this link and all the links stacked above it.
		*/
		public Collection<LinkAddress> getAllLinkAddresses() {
		Collection<LinkAddress> addresses = new ArrayList<LinkAddress>();
		addresses.addAll(mLinkAddresses);
		for (LinkProperties stacked: mStackedLinks.values()) {
		addresses.addAll(stacked.getAllLinkAddresses());
		}
		return addresses;
		}

		public void addDns(InetAddress dns) {
		if (dns != null) mDnses.add(dns);
		}
		@@ -426,13 +458,11 @@ public class LinkProperties implements Parcelable {
		}

		/**
		* Return two lists, a list of addresses that would be removed from
		* mLinkAddresses and a list of addresses that would be added to
		* mLinkAddress which would then result in target and mLinkAddresses
		* being the same list.
		* Compares the addresses in this LinkProperties with another
		* LinkProperties, examining only addresses on the base link.
		*
		* @param target is a LinkProperties with the new list of addresses
		* @return the removed and added lists.
		* @param target a LinkProperties with the new list of addresses
		* @return the differences between the addresses.
		*/
		public CompareResult<LinkAddress> compareAddresses(LinkProperties target) {
		/*
		@@ -456,13 +486,11 @@ public class LinkProperties implements Parcelable {
		}

		/**
		* Return two lists, a list of dns addresses that would be removed from
		* mDnses and a list of addresses that would be added to
		* mDnses which would then result in target and mDnses
		* being the same list.
		* Compares the DNS addresses in this LinkProperties with another
		* LinkProperties, examining only DNS addresses on the base link.
		*
		* @param target is a LinkProperties with the new list of dns addresses
		* @return the removed and added lists.
		* @param target a LinkProperties with the new list of dns addresses
		* @return the differences between the DNS addresses.
		*/
		public CompareResult<InetAddress> compareDnses(LinkProperties target) {
		/*
		@@ -487,15 +515,13 @@ public class LinkProperties implements Parcelable {
		}

		/**
		* Return two lists, a list of routes that would be removed from
		* mRoutes and a list of routes that would be added to
		* mRoutes which would then result in target and mRoutes
		* being the same list.
		* Compares all routes in this LinkProperties with another LinkProperties,
		* examining both the the base link and all stacked links.
		*
		* @param target is a LinkProperties with the new list of routes
		* @return the removed and added lists.
		* @param target a LinkProperties with the new list of routes
		* @return the differences between the routes.
		*/
		public CompareResult<RouteInfo> compareRoutes(LinkProperties target) {
		public CompareResult<RouteInfo> compareAllRoutes(LinkProperties target) {
		/*
		* Duplicate the RouteInfos into removed, we will be removing
		* routes which are common between mRoutes and target

core/tests/coretests/src/android/net/LinkPropertiesTest.java

+23 −4

Original line number	Diff line number	Diff line
		@@ -273,28 +273,47 @@ public class LinkPropertiesTest extends TestCase {
		// Check comparisons work.
		LinkProperties lp2 = new LinkProperties(lp);
		assertAllRoutesHaveInterface("wlan0", lp);
		assertEquals(0, lp.compareRoutes(lp2).added.size());
		assertEquals(0, lp.compareRoutes(lp2).removed.size());
		assertEquals(0, lp.compareAllRoutes(lp2).added.size());
		assertEquals(0, lp.compareAllRoutes(lp2).removed.size());

		lp2.setInterfaceName("p2p0");
		assertAllRoutesHaveInterface("p2p0", lp2);
		assertEquals(3, lp.compareRoutes(lp2).added.size());
		assertEquals(3, lp.compareRoutes(lp2).removed.size());
		assertEquals(3, lp.compareAllRoutes(lp2).added.size());
		assertEquals(3, lp.compareAllRoutes(lp2).removed.size());
		}

		@SmallTest
		public void testStackedInterfaces() {
		LinkProperties rmnet0 = new LinkProperties();
		rmnet0.setInterfaceName("rmnet0");
		rmnet0.addLinkAddress(new LinkAddress(
		NetworkUtils.numericToInetAddress(ADDRV6), 128));

		LinkProperties clat4 = new LinkProperties();
		clat4.setInterfaceName("clat4");
		clat4.addLinkAddress(new LinkAddress(
		NetworkUtils.numericToInetAddress(ADDRV4), 32));

		assertEquals(0, rmnet0.getStackedLinks().size());
		assertEquals(1, rmnet0.getAddresses().size());
		assertEquals(1, rmnet0.getLinkAddresses().size());
		assertEquals(1, rmnet0.getAllAddresses().size());
		assertEquals(1, rmnet0.getAllLinkAddresses().size());

		rmnet0.addStackedLink(clat4);
		assertEquals(1, rmnet0.getStackedLinks().size());
		assertEquals(1, rmnet0.getAddresses().size());
		assertEquals(1, rmnet0.getLinkAddresses().size());
		assertEquals(2, rmnet0.getAllAddresses().size());
		assertEquals(2, rmnet0.getAllLinkAddresses().size());

		rmnet0.addStackedLink(clat4);
		assertEquals(1, rmnet0.getStackedLinks().size());
		assertEquals(1, rmnet0.getAddresses().size());
		assertEquals(1, rmnet0.getLinkAddresses().size());
		assertEquals(2, rmnet0.getAllAddresses().size());
		assertEquals(2, rmnet0.getAllLinkAddresses().size());

		assertEquals(0, clat4.getStackedLinks().size());

		// Modify an item in the returned collection to see what happens.

services/java/com/android/server/ConnectivityService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -2433,7 +2433,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		CompareResult<RouteInfo> routeDiff = new CompareResult<RouteInfo>();
		if (curLp != null) {
		// check for the delta between the current set and the new
		routeDiff = curLp.compareRoutes(newLp);
		routeDiff = curLp.compareAllRoutes(newLp);
		dnsDiff = curLp.compareDnses(newLp);
		} else if (newLp != null) {
		routeDiff.added = newLp.getAllRoutes();