am ca4ba835: am 41708e1c: DO NOT MERGE Sanitize WifiConfigs
* commit 'ca4ba835742e7131e1ae7a4a18f3989a1e96d9ed':
DO NOT MERGE Sanitize WifiConfigs
diff --git a/core/java/android/net/LinkProperties.java b/core/java/android/net/LinkProperties.java
index 75f8b59..dc9a54f 100644
--- a/core/java/android/net/LinkProperties.java
+++ b/core/java/android/net/LinkProperties.java
@@ -144,6 +144,16 @@
return Collections.unmodifiableCollection(mLinkAddresses);
}
+ /**
+ * 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) {
if (dns != null) mDnses.add(dns);
}
@@ -198,6 +208,16 @@
return routes;
}
+ /**
+ * Replaces the RouteInfos on this link with the given collection of RouteInfos.
+ */
+ public void setRoutes(Collection<RouteInfo> routes) {
+ mRoutes.clear();
+ for (RouteInfo route : routes) {
+ addRoute(route);
+ }
+ }
+
public void setHttpProxy(ProxyProperties proxy) {
mHttpProxy = proxy;
}