Merge "Add a function to replace all the link addresses." into klp-dev (a7597d17) · Commits · e / os / android_frameworks_base

core/java/android/net/LinkProperties.java

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -197,6 +197,16 @@ public class LinkProperties implements Parcelable {
	return addresses;		return addresses;
	}		}

			/**
			* Replaces the LinkAddresses on this link with the given collection of addresses.
			*/
			public void setLinkAddresses(Collection<LinkAddress> addresses) {
			mLinkAddresses.clear();
			for (LinkAddress address: addresses) {
			addLinkAddress(address);
			}
			}

	public void addDns(InetAddress dns) {		public void addDns(InetAddress dns) {
	if (dns != null) mDnses.add(dns);		if (dns != null) mDnses.add(dns);
	}		}

+15 −0

Original line number	Original line	Diff line number	Diff line
	@@ -363,4 +363,19 @@ public class LinkPropertiesTest extends TestCase {
	assertFalse(lp.hasIPv4Address());		assertFalse(lp.hasIPv4Address());
	assertFalse(lp.removeLinkAddress(LINKADDRV4));		assertFalse(lp.removeLinkAddress(LINKADDRV4));
	}		}

			@SmallTest
			public void testSetLinkAddresses() {
			LinkProperties lp = new LinkProperties();
			lp.addLinkAddress(LINKADDRV4);
			lp.addLinkAddress(LINKADDRV6);

			LinkProperties lp2 = new LinkProperties();
			lp2.addLinkAddress(LINKADDRV6);

			assertFalse(lp.equals(lp2));

			lp2.setLinkAddresses(lp.getLinkAddresses());
			assertTrue(lp.equals(lp));
			}
	}		}