am 4aadb99c: am 2d3f03d7: DO NOT MERGE Sanitize WifiConfigs

* commit '4aadb99cfb14dc955967a5fed60d7138ce7ee068':
  DO NOT MERGE Sanitize WifiConfigs
This commit is contained in:
Robert Greenwalt
2014-02-25 10:12:35 -08:00
committed by Android Git Automerger

View File

@@ -144,6 +144,16 @@ public class LinkProperties implements Parcelable {
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 @@ public class LinkProperties implements Parcelable {
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;
}