am 106627e0: am e42ce676: am ebf23a8d: am 8a1be0be: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev

* commit '106627e07cecfa8a9bcc43578fde78652fc59eba':
  DO NOT MERGE Sanitize WifiConfigs
This commit is contained in:
Robert Greenwalt
2014-04-07 20:00:33 +00:00
committed by Android Git Automerger

View File

@@ -112,6 +112,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);
}
@@ -127,6 +137,16 @@ public class LinkProperties implements Parcelable {
return Collections.unmodifiableCollection(mRoutes);
}
/**
* 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;
}